Fix compiler warnings

[wget] / src / test.c

diff --git a/src/test.c b/src/test.c
index a124eeaa27e522ac21ba95ca8188d1266b39a886..68c4863bca551a9ba2100ce69ec2118d9d07bf37 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -1,11 +1,12 @@
 /* Unit testing.
 /* Unit testing.

-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+   Foundation, Inc.

 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or

 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,18 +15,20 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with Wget; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables.  You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL".  If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so.  If you do not wish to do
-so, delete this exception statement from your version.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */
+
+#include "wget.h"

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 


@@ -35,35 +38,58 @@ so, delete this exception statement from your version.  */
 #error "TESTING not set!!!"
 #endif
 
 #error "TESTING not set!!!"
 #endif
 

-int tests_run;
+const char *test_parse_content_disposition();
+const char *test_subdir_p();
+const char *test_dir_matches_p();
+const char *test_commands_sorted();
+const char *test_cmd_spec_restrict_file_names();
+const char *test_path_simplify ();
+const char *test_append_uri_pathel();
+const char *test_are_urls_equal();
+const char *test_is_robots_txt_url();
+
+const char *program_argstring = "TEST";

 
 

-// char *test_ccache();
+int tests_run;

 
 

-static char *
+static const char *

 all_tests()
 {
 all_tests()
 {

-  // mu_run_test (test_ccache);
-  
+  mu_run_test (test_parse_content_disposition);
+  mu_run_test (test_subdir_p);
+  mu_run_test (test_dir_matches_p);
+  mu_run_test (test_commands_sorted);
+  mu_run_test (test_cmd_spec_restrict_file_names);
+  mu_run_test (test_path_simplify);
+  mu_run_test (test_append_uri_pathel);
+  mu_run_test (test_are_urls_equal);
+  mu_run_test (test_is_robots_txt_url);
+

   return NULL;
 }
 
   return NULL;
 }
 

+char *program_name; /* Needed by lib/error.c. */

 
 int
 
 int

-main (void) 
+main (int argc _GL_UNUSED, char *argv[])

 {
 {

-  char *result = all_tests();
-  
-  if (result != NULL) 
+  const char *result;
+
+  program_name = argv[0];
+
+  result = all_tests();
+
+  if (result != NULL)

     {
       puts (result);
     }
     {
       puts (result);
     }

-  else 
+  else

     {
       printf ("ALL TESTS PASSED\n");
     }
     {
       printf ("ALL TESTS PASSED\n");
     }

-  
+

   printf ("Tests run: %d\n", tests_run);
   printf ("Tests run: %d\n", tests_run);

- 
+

   return result != 0;
 }
 
   return result != 0;
 }