remove test file

README

@@ -18,6 +18,15 @@ Andy Beverley
 RELEASE NOTES
 =============
 
+
+v0.17
+=====
+- Remove control reaches end of non-void function" warnings(Thanks Vincent
+  Untz).
+- Remove unused variables (thanks Vincent Untz).
+- Change start key to 'S' instead of F10 (closes debian bug #755474).
+- Fix problem with unusable device (Closes debian bug #755473).
+
 v0.16
 =====
 - Fix problems building with clang compiler (thanks Martijn van Brummelen)

configure.ac

@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.64])
-AC_INIT(nwipe, 0.16, andy@andybev.com)
-AM_INIT_AUTOMAKE(nwipe, 0.16)
+AC_INIT(nwipe, 0.17, andy@andybev.com)
+AM_INIT_AUTOMAKE(nwipe, 0.17)
 AC_OUTPUT(Makefile src/Makefile man/Makefile)
 AC_CONFIG_SRCDIR([src/nwipe.c])
 AC_CONFIG_HEADERS([config.h])

man/nwipe.1

@@ -1,4 +1,4 @@
-.TH NWIPE "1" "March 2014" "nwipe version 0.16" "User Commands"
+.TH NWIPE "1" "October 2014" "nwipe version 0.17" "User Commands"
 .SH NAME
 nwipe \- securely erase disks
 .SH SYNOPSIS

src/gui.c

@@ -123,7 +123,7 @@ const char* options_title = " Options ";
 const char* stats_title = " Statistics ";
 
 /* Footer labels. */
-const char* nwipe_buttons1 = "Ctrl-C=Quit F10=Start M=Method P=PRNG V=Verify R=Rounds B=Blanking-pass Space=Select";
+const char* nwipe_buttons1 = "Ctrl-C=Quit S=Start M=Method P=PRNG V=Verify R=Rounds B=Blanking-pass Space=Select";
 const char* nwipe_buttons2 = " J=Up K=Down Space=Select";
 const char* nwipe_buttons3 = " B=Blank screen, ctrl-c=Quit";
 
@@ -750,7 +750,7 @@ void nwipe_gui_select( int count, nwipe_context_t** c )
 
 		} /* keystroke switch */
 
-	} while( keystroke != KEY_F(10) && keystroke != ERR );
+	} while( keystroke != 'S' && keystroke != ERR );
 
 	/* Clear the main window. */
 	werase( main_window );
@@ -2017,6 +2017,7 @@ void *nwipe_gui_status( void *ptr )
 	wrefresh( footer_window );
 	nwipe_misc_thread_data->gui_thread = 0;
 	
+    return NULL;
 } /* nwipe_gui_status */
 
 int compute_stats(void *ptr)

src/method.c

@@ -111,6 +111,7 @@ void *nwipe_zero( void *ptr )
 	/* Finished. Set the thread ID to 0 so that the GUI knows */
 	c->thread = 0;
 
+    return NULL;
 } /* nwipe_zero */
 
 
@@ -173,6 +174,7 @@ void *nwipe_dod522022m( void *ptr )
 	/* Finished. Set the thread ID to 0 so that the GUI knows */
 	c->thread = 0;
 
+    return NULL;
 } /* nwipe_dod522022m */
 
 
@@ -229,6 +231,7 @@ void *nwipe_dodshort( void *ptr )
 	/* Finished. Set the thread ID to 0 so that the GUI knows */
 	c->thread = 0;
 
+    return NULL;
 } /* nwipe_dodshort */
 
 
@@ -355,6 +358,7 @@ void *nwipe_gutmann( void *ptr )
 	/* Finished. Set the thread ID to 0 so that the GUI knows */
 	c->thread = 0;
 
+    return NULL;
 } /* nwipe_gutmann */
 
 
@@ -506,6 +510,7 @@ void *nwipe_ops2( void *ptr )
 	/* Finished. Set the thread ID to 0 so that the GUI knows */
 	c->thread = 0;
 
+    return NULL;
 } /* nwipe_ops2 */
 
 
@@ -534,6 +539,7 @@ void *nwipe_random( void *ptr )
 	/* Finished. Set the thread ID to 0 so that the GUI knows */
 	c->thread = 0;
 
+    return NULL;
 } /* nwipe_random */
 
 

src/nwipe.c

@@ -48,18 +48,9 @@ int main( int argc, char** argv )
         int nwipe_enumerated;          /* The number of contexts that have been enumerated. */
         int nwipe_error = 0;           /* An error counter.                                 */
         int nwipe_selected = 0;        /* The number of contexts that have been selected.   */
-        int nwipe_shmid;               /* A shared memory handle for the context array.     */
-        int nwipe_wait  = 0;           /* The number of child processes that have returned. */
         pthread_t nwipe_gui_thread;    /* The thread ID of the GUI thread.                  */
         pthread_t nwipe_sigint_thread; /* The thread ID of the sigint handler.              */
 
-        /* The list of device filenames. */
-        char** nwipe_names = NULL;
-        
-        /* Used to write-out the result file. */
-        char nwipe_result_file [FILENAME_MAX];
-        FILE* nwipe_result_fp;
-
         /* The entropy source file handle. */
         int nwipe_entropy; 
 
@@ -105,10 +96,15 @@ int main( int argc, char** argv )
         else
         {
 
-                 argv += nwipe_optind;
+                argv += nwipe_optind;
                 argc -= nwipe_optind;
 
                 nwipe_enumerated = nwipe_device_get( &c1, argv, argc );
+                if ( nwipe_enumerated == 0 )
+                {
+                    exit(1);
+                }
+
         }
 
 

src/version.c

@@ -4,7 +4,7 @@
  * used by configure to dynamically assign those values 
  * to documentation files.
  */
-const char *version_string = "0.16";
+const char *version_string = "0.17";
 const char *program_name   = "nwipe";
 const char *author_name    = "Andy Beverley";
 const char *email_address  = "andy@andybev.com";