[GNUnet-SVN] r12772 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-08-30 23:32:26 +0200 (Mon, 30 Aug 2010)
New Revision: 12772

Modified:
   gnunet/src/util/test_configuration.c
   gnunet/src/util/test_container_slist.c
Log:
fixes

Modified: gnunet/src/util/test_configuration.c
===================================================================
--- gnunet/src/util/test_configuration.c        2010-08-30 21:32:14 UTC (rev 
12771)
+++ gnunet/src/util/test_configuration.c        2010-08-30 21:32:26 UTC (rev 
12772)
@@ -492,15 +492,22 @@
       GNUNET_CONFIGURATION_destroy (cfg);
       return 1;
     }
-  if ((GNUNET_OK !=
-       GNUNET_CONFIGURATION_get_value_string (cfg, "TESTING", "WEAKRANDOM",
-                                             &c))
-      || (0 != strcmp (c, "YES")))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg, "TESTING", "WEAKRANDOM",
+                                            &c))
     {
       GNUNET_break (0);
       GNUNET_CONFIGURATION_destroy (cfg);
       return 1;
     }
+  if (0 != strcmp (c, "YES"))
+    {
+      GNUNET_break (0);
+      GNUNET_free (c);
+      GNUNET_CONFIGURATION_destroy (cfg);
+      return 1;
+    }
+
   GNUNET_free (c);
   GNUNET_CONFIGURATION_destroy (cfg);
 

Modified: gnunet/src/util/test_container_slist.c
===================================================================
--- gnunet/src/util/test_container_slist.c      2010-08-30 21:32:14 UTC (rev 
12771)
+++ gnunet/src/util/test_container_slist.c      2010-08-30 21:32:26 UTC (rev 
12772)
@@ -28,8 +28,7 @@
 #include "gnunet_common.h"
 #include "gnunet_container_lib.h"
 
-#define ABORT() { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); 
return 1; }
-#define CHECK(c) { if (! (c)) ABORT(); }
+#define CHECK(c) do { if (! (c)) { fprintf(stderr, "Error at %s:%d\n", 
__FILE__, __LINE__); GNUNET_CONTAINER_slist_destroy (l); return 1; } } while (0)
 
 int
 main (int argc, char *argv[])