-code deduplication in rsa sign/verify code

[oweals/gnunet.git] / src / util / test_getopt.c

diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c
index 89e7be863fe97f0985a15ece2fb9448e1418e4a3..65c3b5d2ee99bff5380cfc086c848bc321cd36d7 100644 (file)
--- a/src/util/test_getopt.c
+++ b/src/util/test_getopt.c
@@ -4,7 +4,7 @@
 
      GNUnet 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, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -26,12 +26,10 @@
 #include "gnunet_configuration_lib.h"
 #include "gnunet_getopt_lib.h"
 
-#define VERBOSE 0
 
 static int
 testMinimal ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const emptyargv[] = {
     "test",
     NULL
@@ -40,21 +38,16 @@ testMinimal ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (1 != GNUNET_GETOPT_run ("test", cfg, emptyoptionlist, 1, emptyargv))
-    {
-      GNUNET_CONFIGURATION_destroy (cfg);
-      return 1;
-    }
-  GNUNET_CONFIGURATION_destroy (cfg);
+  if (1 != GNUNET_GETOPT_run ("test", emptyoptionlist, 1, emptyargv))
+    return 1;
 
   return 0;
 }
 
+
 static int
 testVerbose ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const myargv[] = {
     "test",
     "-V",
@@ -63,31 +56,29 @@ testVerbose ()
     NULL
   };
   unsigned int vflags = 0;
+
   const struct GNUNET_GETOPT_CommandLineOption verboseoptionlist[] = {
     GNUNET_GETOPT_OPTION_VERBOSE (&vflags),
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (3 != GNUNET_GETOPT_run ("test", cfg, verboseoptionlist, 4, myargv))
-    {
-      GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      return 1;
-    }
-  GNUNET_CONFIGURATION_destroy (cfg);
+  if (3 != GNUNET_GETOPT_run ("test", verboseoptionlist, 4, myargv))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   if (vflags != 2)
-    {
-      GNUNET_break (0);
-      return 1;
-    }
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   return 0;
 }
 
+
 static int
 testVersion ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const myargv[] = {
     "test_getopt",
     "-v",
@@ -98,22 +89,18 @@ testVersion ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (-1 != GNUNET_GETOPT_run ("test_getopt",
-                               cfg, versionoptionlist, 2, myargv))
-    {
-      GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      return 1;
-    }
-  GNUNET_CONFIGURATION_destroy (cfg);
+  if (0 != GNUNET_GETOPT_run ("test_getopt", versionoptionlist, 2, myargv))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   return 0;
 }
 
+
 static int
 testAbout ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const myargv[] = {
     "test_getopt",
     "-h",
@@ -124,22 +111,18 @@ testAbout ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (-1 != GNUNET_GETOPT_run ("test_getopt",
-                               cfg, aboutoptionlist, 2, myargv))
-    {
-      GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      return 1;
-    }
-  GNUNET_CONFIGURATION_destroy (cfg);
+  if (0 != GNUNET_GETOPT_run ("test_getopt", aboutoptionlist, 2, myargv))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   return 0;
 }
 
+
 static int
 testLogOpts ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const myargv[] = {
     "test_getopt",
     "-l", "filename",
@@ -148,37 +131,35 @@ testLogOpts ()
   };
   char *level = GNUNET_strdup ("stuff");
   char *fn = NULL;
+
   const struct GNUNET_GETOPT_CommandLineOption logoptionlist[] = {
     GNUNET_GETOPT_OPTION_LOGFILE (&fn),
     GNUNET_GETOPT_OPTION_LOGLEVEL (&level),
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (5 != GNUNET_GETOPT_run ("test_getopt", cfg, logoptionlist, 5, myargv))
-    {
-      GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      return 1;
-    }
+  if (5 != GNUNET_GETOPT_run ("test_getopt", logoptionlist, 5, myargv))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   GNUNET_assert (fn != NULL);
-  GNUNET_CONFIGURATION_destroy (cfg);
   if ((0 != strcmp (level, "WARNING")) || (0 != strcmp (fn, "filename")))
-    {
-      GNUNET_break (0);
-      GNUNET_free (level);
-      GNUNET_free (fn);
-      return 1;
-    }
+  {
+    GNUNET_break (0);
+    GNUNET_free (level);
+    GNUNET_free (fn);
+    return 1;
+  }
   GNUNET_free (level);
   GNUNET_free (fn);
   return 0;
 }
 
+
 static int
 testFlagNum ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const myargv[] = {
     "test_getopt",
     "-f",
@@ -189,6 +170,7 @@ testFlagNum ()
   int flag = 0;
   unsigned int num = 0;
   unsigned long long lnum = 0;
+
   const struct GNUNET_GETOPT_CommandLineOption logoptionlist[] = {
     {'f', "--flag", NULL, "helptext", 0, &GNUNET_GETOPT_set_one,
      (void *) &flag},
@@ -199,22 +181,20 @@ testFlagNum ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (6 != GNUNET_GETOPT_run ("test_getopt", cfg, logoptionlist, 6, myargv))
-    {
-      GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      return 1;
-    }
-  GNUNET_CONFIGURATION_destroy (cfg);
+  if (6 != GNUNET_GETOPT_run ("test_getopt", logoptionlist, 6, myargv))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   if ((1 != flag) || (42 != num) || (42 != lnum))
-    {
-      GNUNET_break (0);
-      return 1;
-    }
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   return 0;
 }
 
+
 int
 main (int argc, char *argv[])
 {
@@ -222,7 +202,9 @@ main (int argc, char *argv[])
 
   GNUNET_log_setup ("test_getopt", "WARNING", NULL);
   /* suppress output from -h, -v options */
+#ifndef MINGW
   GNUNET_break (0 == CLOSE (1));
+#endif
   if (0 != testMinimal ())
     errCnt++;
   if (0 != testVerbose ())