[GNUnet-SVN] r1755 - GNUnet/src/conf

[grothoff]

Author: grothoff
Date: 2005-08-19 01:18:56 -0700 (Fri, 19 Aug 2005)
New Revision: 1755

Modified:
   GNUnet/src/conf/confdata.c
   GNUnet/src/conf/expr.c
Log:
sync

Modified: GNUnet/src/conf/confdata.c
===================================================================
--- GNUnet/src/conf/confdata.c  2005-08-19 08:03:38 UTC (rev 1754)
+++ GNUnet/src/conf/confdata.c  2005-08-19 08:18:56 UTC (rev 1755)
@@ -53,9 +53,9 @@
   int i = 0;
   
   GNUNET_ASSERT(name != NULL);
-  setConfigurationString("FILES",
-                        "gnunet.conf",
-                        name);
+  FREENONNULL(setConfigurationString("FILES",
+                                    "gnunet.conf",
+                                    name));
   readConfigFile(name);        
   
   for_all_symbols(i, sym) {

Modified: GNUnet/src/conf/expr.c
===================================================================
--- GNUnet/src/conf/expr.c      2005-08-19 08:03:38 UTC (rev 1754)
+++ GNUnet/src/conf/expr.c      2005-08-19 08:18:56 UTC (rev 1755)
@@ -616,7 +616,8 @@
        while (1) {
                trans_count = 0;
                switch (e->type) {
-               case E_OR: case E_AND:
+               case E_OR:
+               case E_AND:
                        expr_eliminate_dups1(e->type, &e, &e);
                        expr_eliminate_dups2(e->type, &e, &e);
                default: