X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Futil%2Ftest_getopt.c;h=f068a6ab0403fe1cfc5897e381102914aa1c1a6c;hb=f501080b97356351732aee8302de888e89a1b502;hp=1472fbb91231bb25dcff59584057934ea6de3f7d;hpb=652e89b59ed2207c2c12172fdabcd6e659995c81;p=oweals%2Fgnunet.git

diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c
index 1472fbb91..f068a6ab0 100644
--- 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,7 +26,6 @@
 #include "gnunet_configuration_lib.h"
 #include "gnunet_getopt_lib.h"
 
-#define VERBOSE 0
 
 static int
 testMinimal ()
@@ -45,6 +44,7 @@ testMinimal ()
   return 0;
 }
 
+
 static int
 testVerbose ()
 {
@@ -56,24 +56,26 @@ testVerbose ()
     NULL
   };
   unsigned int vflags = 0;
+
   const struct GNUNET_GETOPT_CommandLineOption verboseoptionlist[] = {
     GNUNET_GETOPT_OPTION_VERBOSE (&vflags),
     GNUNET_GETOPT_OPTION_END
   };
 
   if (3 != GNUNET_GETOPT_run ("test", verboseoptionlist, 4, myargv))
-    {
-      GNUNET_break (0);
-      return 1;
-    }
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   if (vflags != 2)
-    {
-      GNUNET_break (0);
-      return 1;
-    }
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   return 0;
 }
 
+
 static int
 testVersion ()
 {
@@ -88,13 +90,14 @@ testVersion ()
   };
 
   if (-1 != GNUNET_GETOPT_run ("test_getopt", versionoptionlist, 2, myargv))
-    {
-      GNUNET_break (0);
-      return 1;
-    }
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   return 0;
 }
 
+
 static int
 testAbout ()
 {
@@ -109,13 +112,14 @@ testAbout ()
   };
 
   if (-1 != GNUNET_GETOPT_run ("test_getopt", aboutoptionlist, 2, myargv))
-    {
-      GNUNET_break (0);
-      return 1;
-    }
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   return 0;
 }
 
+
 static int
 testLogOpts ()
 {
@@ -127,6 +131,7 @@ 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),
@@ -134,23 +139,24 @@ testLogOpts ()
   };
 
   if (5 != GNUNET_GETOPT_run ("test_getopt", logoptionlist, 5, myargv))
-    {
-      GNUNET_break (0);
-      return 1;
-    }
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   GNUNET_assert (fn != NULL);
   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 ()
 {
@@ -164,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},
@@ -175,18 +182,19 @@ testFlagNum ()
   };
 
   if (6 != GNUNET_GETOPT_run ("test_getopt", logoptionlist, 6, myargv))
-    {
-      GNUNET_break (0);
-      return 1;
-    }
+  {
+    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[])
 {