From 50d2cec912bf61df9088fc1aed02346abda00c6e Mon Sep 17 00:00:00 2001 From: jsteube Date: Mon, 3 Oct 2016 00:01:37 +0200 Subject: [PATCH] Fix some variable name convention --- include/types.h | 2 +- src/hashcat.c | 6 +++--- src/restore.c | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/types.h b/include/types.h index b8a27d9b3..3e08ac7ea 100644 --- a/include/types.h +++ b/include/types.h @@ -934,7 +934,7 @@ typedef struct restore_data char cwd[256]; u32 pid; - u32 dictpos; + u32 dicts_pos; u32 masks_pos; u64 words_cur; diff --git a/src/hashcat.c b/src/hashcat.c index d617fee00..6ebe25c6c 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -1233,9 +1233,9 @@ static int inner1_loop (hashcat_ctx_t *hashcat_ctx) if (straight_ctx->dicts_cnt) { - for (u32 dicts_pos = rd->dictpos; dicts_pos < straight_ctx->dicts_cnt; dicts_pos++) + for (u32 dicts_pos = rd->dicts_pos; dicts_pos < straight_ctx->dicts_cnt; dicts_pos++) { - rd->dictpos = dicts_pos; + rd->dicts_pos = dicts_pos; straight_ctx->dicts_pos = dicts_pos; @@ -1625,7 +1625,7 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx) { if (masks_pos > rd->masks_pos) { - rd->dictpos = 0; + rd->dicts_pos = 0; } rd->masks_pos = masks_pos; diff --git a/src/restore.c b/src/restore.c index 117acefb9..40418dcb5 100644 --- a/src/restore.c +++ b/src/restore.c @@ -393,10 +393,6 @@ int restore_ctx_init (restore_ctx_t *restore_ctx, user_options_t *user_options, const int rc_options_getopt = user_options_getopt (user_options, rd->argc, rd->argv); if (rc_options_getopt == -1) return -1; - - const int rc_options_sanity = user_options_sanity (user_options); - - if (rc_options_sanity == -1) return -1; } return 0;