Use larger counter to handle larger wordlists

include/filehandling.h

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <errno.h>
 
-uint count_lines (FILE *fd);
+u64 count_lines (FILE *fd);
 
 int fgetl (FILE *fp, char *line_buf);
 

include/types.h

@@ -1006,12 +1006,12 @@ typedef struct
   bool enabled;
 
   char *buf;
-  u32  incr;
-  u32  avail;
-  u32  cnt;
-  u32  pos;
+  u64  incr;
+  u64  avail;
+  u64  cnt;
+  u64  pos;
 
-  void (*func) (char *, u32, u32 *, u32 *);
+  void (*func) (char *, u64, u64 *, u64 *);
 
 } wl_data_t;
 
@@ -1129,11 +1129,6 @@ typedef struct
 
 } user_options_extra_t;
 
-typedef struct
-{
-
-} session_ctx_t;
-
 typedef struct
 {
   bool enabled;
@@ -1355,7 +1350,6 @@ typedef struct
   potfile_ctx_t         *potfile_ctx;
   restore_ctx_t         *restore_ctx;
   status_ctx_t          *status_ctx;
-  session_ctx_t         *session_ctx;
   straight_ctx_t        *straight_ctx;
   tuning_db_t           *tuning_db;
   user_options_extra_t  *user_options_extra;

include/wordlist.h

@@ -13,9 +13,9 @@ uint convert_from_hex (char *line_buf, const uint line_len, const user_options_t
 
 void load_segment (wl_data_t *wl_data, FILE *fd);
 
-void get_next_word_lm  (char *buf, u32 sz, u32 *len, u32 *off);
-void get_next_word_uc  (char *buf, u32 sz, u32 *len, u32 *off);
-void get_next_word_std (char *buf, u32 sz, u32 *len, u32 *off);
+void get_next_word_lm  (char *buf, u64 sz, u64 *len, u64 *off);
+void get_next_word_uc  (char *buf, u64 sz, u64 *len, u64 *off);
+void get_next_word_std (char *buf, u64 sz, u64 *len, u64 *off);
 
 void get_next_word (wl_data_t *wl_data, const user_options_t *user_options, const user_options_extra_t *user_options_extra, FILE *fd, char **out_buf, uint *out_len);