Merge pull request #482 from neheb/master

Fix some more warnings.

include/cpu-des.h

@@ -0,0 +1,2 @@
+void _des_keysetup (u32 data[2], u32 Kc[16], u32 Kd[16], const u32 s_skb[8][64]);
+void _des_encrypt (u32 data[2], u32 Kc[16], u32 Kd[16], const u32 s_SPtrans[8][64]);

include/cpu-md5.h

@@ -1,2 +1,2 @@
 void md5_64 (uint block[16], uint digest[4]);
-
+void md5_complete_no_limit (uint digest[4], uint *plain, uint plain_len);

include/cpu-sha1.h

@@ -0,0 +1 @@
+void sha1_64 (uint block[16], uint digest[5]);

include/cpu-sha256.h

@@ -0,0 +1 @@
+void sha256_64 (uint block[16], uint digest[8]);

include/shared.h

@@ -1364,7 +1364,7 @@ void dump_hex (const u8 *s, const int sz);
 
 void truecrypt_crc32 (const char *filename, u8 keytab[64]);
 
-char *get_exec_path   ();
+char *get_exec_path   (void);
 char *get_install_dir (const char *progname);
 char *get_profile_dir (const char *homedir);
 char *get_session_dir (const char *profile_dir);
@@ -1442,8 +1442,8 @@ void *mymalloc (size_t size);
 void *myrealloc (void *ptr, size_t oldsz, size_t add);
 char *mystrdup (const char *s);
 
-char *logfile_generate_topid ();
-char *logfile_generate_subid ();
+char *logfile_generate_topid (void);
+char *logfile_generate_subid (void);
 void logfile_append (const char *fmt, ...);
 
 #ifdef F_SETLKW
@@ -1495,8 +1495,8 @@ int hm_set_fanspeed_with_device_id_xnvctrl   (const uint device_id, const int fa
 void hm_device_val_to_str (char *target_buf, int max_buf_size, char *suffix, int value);
 #endif // HAVE_HWMON
 
-void myabort ();
-void myquit ();
+void myabort (void);
+void myquit  (void);
 
 void set_cpu_affinity (char *cpu_affinity);
 
@@ -1688,13 +1688,13 @@ void naive_escape (char *s, size_t s_max, const u8 key_char, const u8 escape_cha
 void load_kernel (const char *kernel_file, int num_devices, size_t *kernel_lengths, const u8 **kernel_sources);
 void writeProgramBin (char *dst, u8 *binary, size_t binary_size);
 
-u64 get_lowest_words_done ();
+u64 get_lowest_words_done (void);
 
 restore_data_t *init_restore  (int argc, char **argv);
 void            read_restore  (const char *eff_restore_file, restore_data_t *rd);
 void            write_restore (const char *new_restore_file, restore_data_t *rd);
-void            cycle_restore ();
-void            check_checkpoint ();
+void            cycle_restore (void);
+void            check_checkpoint (void);
 
 #ifdef WIN
 
@@ -1756,17 +1756,23 @@ void *thread_device_watch (void *p);
 void *thread_keypress     (void *p);
 void *thread_runtime      (void *p);
 
+void status_display (void);
+void status_display_machine_readable (void);
+
 /**
  * checksum for use on cpu
  */
 
 #include "cpu-crc32.h"
 #include "cpu-md5.h"
+#include "cpu-sha1.h"
+#include "cpu-sha256.h"
 
 /**
  * ciphers for use on cpu
  */
 
 #include "cpu-aes.h"
+#include "cpu-des.h"
 
 #endif // SHARED_H