Fixed formatting for speed and progress

pull/1975/head
Chick3nman 5 years ago
parent ea141f43da
commit 4d60c7514a

@ -904,11 +904,11 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
}
printf ("\{ \"session\": \"%s\",", hashcat_status->session);
printf (" \"status\": %d,", hashcat_status->status_number);
printf (" \"progress\": \[%," PRIu64 " %\]," PRIu64, hashcat_status->progress_cur_relative_skip, hashcat_status->progress_end_relative_skip);
printf (" \"progress\": \[%" PRIu64 ", %" PRIu64 "\],", hashcat_status->progress_cur_relative_skip, hashcat_status->progress_end_relative_skip);
printf (" \"restore_point\": %," PRIu64, hashcat_status->restore_point);
printf (" \"recovered_hashes\": \[%d, %d\],", hashcat_status->digests_done, hashcat_status->digests_cnt);
printf (" \"recovered_salts\": \[%d, %d\],", hashcat_status->salts_done, hashcat_status->salts_cnt);
printf (" \"rejected\": %," PRIu64, hashcat_status->progress_rejected);
printf (" \"rejected\": %" PRIu64 ",", hashcat_status->progress_rejected);
printf (" \"devices\": \[");
for (int device_id = 0; device_id < hashcat_status->device_info_cnt; device_id++)
{
@ -922,7 +922,7 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
printf(",");
}
printf (" \"device_id\": %d", device_id + 1);
printf (" \"speed\": %," PRIu64, (u64) (device_info->hashes_msec_dev * 1000));
printf (" \"speed\": %" PRIu64 ",", (u64) (device_info->hashes_msec_dev * 1000));
if (hwmon_ctx->enabled == true)
{

Loading…
Cancel
Save