From a048bdc02ccd17dfb649c84b49d5a210d835f2d1 Mon Sep 17 00:00:00 2001 From: jsteube Date: Tue, 22 Nov 2016 18:39:02 +0100 Subject: [PATCH] Fix some variable names in hashcat.log --- include/logfile.h | 12 ++++++------ src/hashcat.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/logfile.h b/include/logfile.h index 09f591121..e2d814644 100644 --- a/include/logfile.h +++ b/include/logfile.h @@ -16,12 +16,12 @@ #define logfile_top_msg(msg) logfile_append (hashcat_ctx, "%s\t%s", logfile_ctx->topid, (msg)); #define logfile_sub_msg(msg) logfile_append (hashcat_ctx, "%s\t%s\t%s", logfile_ctx->topid, logfile_ctx->subid, (msg)); -#define logfile_top_var_uint64(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%" PRIu64 "", logfile_ctx->topid, (var), (val)); -#define logfile_sub_var_uint64(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%s\t%" PRIu64 "", logfile_ctx->topid, logfile_ctx->subid, (var), (val)); -#define logfile_top_var_uint(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%u", logfile_ctx->topid, (var), (val)); -#define logfile_sub_var_uint(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%s\t%u", logfile_ctx->topid, logfile_ctx->subid, (var), (val)); -#define logfile_top_var_char(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%c", logfile_ctx->topid, (var), (val)); -#define logfile_sub_var_char(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%s\t%c", logfile_ctx->topid, logfile_ctx->subid, (var), (val)); +#define logfile_top_var_uint64(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%" PRIu64 "", logfile_ctx->topid, (var), (u64) (val)); +#define logfile_sub_var_uint64(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%s\t%" PRIu64 "", logfile_ctx->topid, logfile_ctx->subid, (var), (u64) (val)); +#define logfile_top_var_uint(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%u", logfile_ctx->topid, (var), (u32) (val)); +#define logfile_sub_var_uint(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%s\t%u", logfile_ctx->topid, logfile_ctx->subid, (var), (u32) (val)); +#define logfile_top_var_char(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%c", logfile_ctx->topid, (var), (char) (val)); +#define logfile_sub_var_char(var,val) logfile_append (hashcat_ctx, "%s\t%s\t%s\t%c", logfile_ctx->topid, logfile_ctx->subid, (var), (char) (val)); #define logfile_top_var_string(var,val) if ((val) != NULL) logfile_append (hashcat_ctx, "%s\t%s\t%s", logfile_ctx->topid, (var), (val)); #define logfile_sub_var_string(var,val) if ((val) != NULL) logfile_append (hashcat_ctx, "%s\t%s\t%s\t%s", logfile_ctx->topid, logfile_ctx->subid, (var), (val)); diff --git a/src/hashcat.c b/src/hashcat.c index b3208d8dd..8f6a9243d 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -259,8 +259,8 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx) status_ctx->runtime_stop = runtime_stop; - logfile_sub_uint ((u32) runtime_start); - logfile_sub_uint ((u32) runtime_stop); + logfile_sub_uint (runtime_start); + logfile_sub_uint (runtime_stop); time (&status_ctx->prepare_start); @@ -1086,8 +1086,8 @@ int hashcat_session_execute (hashcat_ctx_t *hashcat_ctx) const time_t proc_stop = time (NULL); - logfile_top_uint ((u32) proc_start); - logfile_top_uint ((u32) proc_stop); + logfile_top_uint (proc_start); + logfile_top_uint (proc_stop); logfile_top_msg ("STOP");