[GNUnet-SVN] r26584 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2013-03-23 20:58:15 +0100 (Sat, 23 Mar 2013)
New Revision: 26584

Modified:
   gnunet/src/core/test_core_api.c
   gnunet/src/core/test_core_api_reliability.c
Log:
-simplify

Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c     2013-03-23 19:51:12 UTC (rev 26583)
+++ gnunet/src/core/test_core_api.c     2013-03-23 19:58:15 UTC (rev 26584)
@@ -349,8 +349,8 @@
 }
 
 
-static int
-check ()
+int
+main (int argc, char *argv[])
 {
   char *const argv[] = { "test-core-api",
     "-c",
@@ -361,26 +361,17 @@
     GNUNET_GETOPT_OPTION_END
   };
   ok = 1;
+  GNUNET_log_setup ("test-core-api",
+                    "WARNING",
+                    NULL);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
                       "test-core-api", "nohelp", options, &run, &ok);
   stop_arm (&p1);
   stop_arm (&p2);
-  return ok;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int ret;
-
-  GNUNET_log_setup ("test-core-api",
-                    "WARNING",
-                    NULL);
-  ret = check ();
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2");
 
-  return ret;
+  return ok;
 }
 
 /* end of test_core_api.c */

Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2013-03-23 19:51:12 UTC (rev 
26583)
+++ gnunet/src/core/test_core_api_reliability.c 2013-03-23 19:58:15 UTC (rev 
26584)
@@ -461,8 +461,9 @@
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
 
-static int
-check ()
+
+int
+main (int argc, char *argv[])
 {
   char *const argv[] = { "test-core-api-reliability",
     "-c",
@@ -473,28 +474,18 @@
     GNUNET_GETOPT_OPTION_END
   };
   ok = 1;
+  GNUNET_log_setup ("test-core-api",
+                    "WARNING",
+                    NULL);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
                       "test-core-api-reliability", "nohelp", options, &run,
                       &ok);
   stop_arm (&p1);
   stop_arm (&p2);
-  return ok;
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  int ret;
-
-  GNUNET_log_setup ("test-core-api",
-                    "WARNING",
-                    NULL);
-  ret = check ();
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2");
 
-  return ret;
+  return ok;
 }
 
 /* end of test_core_api_reliability.c */