1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-22 22:58:30 +00:00

Merge pull request #118 from philsmd/master

fixed % and C (degrees celsius) in status display
This commit is contained in:
Jens Steube 2016-01-12 08:49:15 +01:00
commit 28517c7a15

View File

@ -1503,12 +1503,12 @@ void status_display ()
if (data.hm_device[i].fan_supported == 1)
{
char temperature[HM_STR_BUF_SIZE];
char utilization[HM_STR_BUF_SIZE];
char temperature[HM_STR_BUF_SIZE];
char fanspeed[HM_STR_BUF_SIZE];
hm_device_val_to_str ((char *) temperature, HM_STR_BUF_SIZE, "%", hm_get_temperature_with_device_id (i));
hm_device_val_to_str ((char *) utilization, HM_STR_BUF_SIZE, "c", hm_get_utilization_with_device_id (i));
hm_device_val_to_str ((char *) utilization, HM_STR_BUF_SIZE, "%", hm_get_utilization_with_device_id (i));
hm_device_val_to_str ((char *) temperature, HM_STR_BUF_SIZE, "c", hm_get_temperature_with_device_id (i));
if (data.vendor_id == VENDOR_ID_AMD)
{
@ -1528,11 +1528,11 @@ void status_display ()
}
else
{
char temperature[HM_STR_BUF_SIZE];
char utilization[HM_STR_BUF_SIZE];
char temperature[HM_STR_BUF_SIZE];
hm_device_val_to_str ((char *) temperature, HM_STR_BUF_SIZE, "%", hm_get_temperature_with_device_id (i));
hm_device_val_to_str ((char *) utilization, HM_STR_BUF_SIZE, "c", hm_get_utilization_with_device_id (i));
hm_device_val_to_str ((char *) utilization, HM_STR_BUF_SIZE, "%", hm_get_utilization_with_device_id (i));
hm_device_val_to_str ((char *) temperature, HM_STR_BUF_SIZE, "c", hm_get_temperature_with_device_id (i));
log_info ("HWMon.GPU.#%d...: %s Util, %s Temp, N/A Fan", i + 1, utilization, temperature);
}