From cc740f2cb2b5d043222eb06538972fc6d385bd07 Mon Sep 17 00:00:00 2001 From: jsteube Date: Wed, 28 Sep 2016 11:55:02 +0200 Subject: [PATCH] Move PW_DICTMAX to common.h --- include/common.h | 3 +++ include/types.h | 45 +++++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/include/common.h b/include/common.h index 6b4d0950e..1a50fbb05 100644 --- a/include/common.h +++ b/include/common.h @@ -27,6 +27,9 @@ #define PW_MAX 54 #define PW_MAX1 (PW_MAX + 1) +#define PW_DICTMAX 31 +#define PW_DICTMAX1 (PW_DICTMAX + 1) + #define EXEC_CACHE 128 #define SPEED_CACHE 128 diff --git a/include/types.h b/include/types.h index c1f5dd77c..d63bbe962 100644 --- a/include/types.h +++ b/include/types.h @@ -1193,6 +1193,29 @@ typedef struct typedef struct { + /** + * migrated + */ + + bitmap_ctx_t *bitmap_ctx; + combinator_ctx_t *combinator_ctx; + debugfile_ctx_t *debugfile_ctx; + hashconfig_t *hashconfig; + hashes_t *hashes; + induct_ctx_t *induct_ctx; + logfile_ctx_t *logfile_ctx; + loopback_ctx_t *loopback_ctx; + mask_ctx_t *mask_ctx; + opencl_ctx_t *opencl_ctx; + outcheck_ctx_t *outcheck_ctx; + outfile_ctx_t *outfile_ctx; + potfile_ctx_t *potfile_ctx; + restore_ctx_t *restore_ctx; + session_ctx_t *session_ctx; + straight_ctx_t *straight_ctx; + user_options_extra_t *user_options_extra; + user_options_t *user_options; + /** * threads */ @@ -1228,25 +1251,6 @@ typedef struct u32 pw_min; u32 pw_max; - opencl_ctx_t *opencl_ctx; - hashconfig_t *hashconfig; - hashes_t *hashes; - user_options_t *user_options; - user_options_extra_t *user_options_extra; - outfile_ctx_t *outfile_ctx; - potfile_ctx_t *potfile_ctx; - loopback_ctx_t *loopback_ctx; - debugfile_ctx_t *debugfile_ctx; - session_ctx_t *session_ctx; - bitmap_ctx_t *bitmap_ctx; - induct_ctx_t *induct_ctx; - outcheck_ctx_t *outcheck_ctx; - logfile_ctx_t *logfile_ctx; - restore_ctx_t *restore_ctx; - straight_ctx_t *straight_ctx; - combinator_ctx_t *combinator_ctx; - mask_ctx_t *mask_ctx; - /** * status, timer */ @@ -1275,7 +1279,4 @@ typedef struct } hc_global_data_t; -#define PW_DICTMAX 31 -#define PW_DICTMAX1 (PW_DICTMAX + 1) - #endif // _TYPES_H