auto-provide OS_IPK paths in [paths] of config

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

diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c
index 67e532f40b46f3ad2fc6954e8ac548586008517c..6227a28db0f99fa95fe03494d6b7b9fb8dd254dd 100644 (file)
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file util/test_configuration.c
  * @brief Test that the configuration module works.
@@ -68,7 +68,7 @@ initDiffsCBData (struct DiffsCBData *cbData)
 /**
  * callback function for modifying
  * and comparing configuration
-*/
+ */
 static void
 diffsCallBack (void *cls, const char *section, const char *option,
                const char *value)
@@ -89,45 +89,49 @@ diffsCallBack (void *cls, const char *section, const char *option,
                                              "new-value");
     }
     break;
+
   case EDIT_ALL:
     GNUNET_CONFIGURATION_set_value_string (cbData->cfg, section, option,
                                            "new-value");
     GNUNET_CONFIGURATION_set_value_string (cbData->cfgDiffs, section, option,
                                            "new-value");
     break;
-  case ADD_NEW_ENTRY:
-  {
-    static int hit = 0;
 
-    if (hit == 0)
+  case ADD_NEW_ENTRY:
     {
-      hit = 1;
-      GNUNET_CONFIGURATION_set_value_string (cbData->cfg, section, "new-key",
-                                             "new-value");
-      GNUNET_CONFIGURATION_set_value_string (cbData->cfgDiffs, section,
-                                             "new-key", "new-value");
+      static int hit = 0;
+
+      if (hit == 0)
+      {
+        hit = 1;
+        GNUNET_CONFIGURATION_set_value_string (cbData->cfg, section, "new-key",
+                                               "new-value");
+        GNUNET_CONFIGURATION_set_value_string (cbData->cfgDiffs, section,
+                                               "new-key", "new-value");
+      }
+      break;
     }
-    break;
-  }
+
   case COMPARE:
-  {
-    int ret;
-    char *diffValue;
+    {
+      int ret;
+      char *diffValue;
 
-    diffValue = NULL;
-    ret =
+      diffValue = NULL;
+      ret =
         GNUNET_CONFIGURATION_get_value_string (cbData->cfgDiffs, section,
                                                option, &diffValue);
-    if (NULL != diffValue)
-    {
-      if (ret == GNUNET_SYSERR || strcmp (diffValue, value) != 0)
+      if (NULL != diffValue)
+      {
+        if ((ret == GNUNET_SYSERR) || (strcmp (diffValue, value) != 0) )
+          cbData->status = 1;
+      }
+      else
         cbData->status = 1;
+      GNUNET_free_non_null (diffValue);
+      break;
     }
-    else
-      cbData->status = 1;
-    GNUNET_free_non_null (diffValue);
-    break;
-  }
+
 #if 0
   case PRINT:
     if (NULL == cbData->section)
@@ -165,29 +169,34 @@ editConfiguration (struct GNUNET_CONFIGURATION_Handle *cfg, int option)
     diffsCB.cfg = cfg;
     GNUNET_CONFIGURATION_iterate (cfg, diffsCallBack, &diffsCB);
     break;
+
   case EDIT_NOTHING:
     /* Do nothing */
     break;
-  case ADD_NEW_SECTION:
-  {
-    int i;
-    char *key;
 
-    for (i = 0; i < 5; i++)
+  case ADD_NEW_SECTION:
     {
-      GNUNET_asprintf (&key, "key%d", i);
-      GNUNET_CONFIGURATION_set_value_string (cfg, "new-section", key,
-                                             "new-value");
-      GNUNET_CONFIGURATION_set_value_string (diffsCB.cfgDiffs, "new-section",
-                                             key, "new-value");
-      GNUNET_free (key);
+      int i;
+      char *key;
+
+      for (i = 0; i < 5; i++)
+      {
+        GNUNET_asprintf (&key, "key%d", i);
+        GNUNET_CONFIGURATION_set_value_string (cfg, "new-section", key,
+                                               "new-value");
+        GNUNET_CONFIGURATION_set_value_string (diffsCB.cfgDiffs, "new-section",
+                                               key, "new-value");
+        GNUNET_free (key);
+      }
+      break;
     }
-    break;
-  }
+
   case REMOVE_SECTION:
     break;
+
   case REMOVE_ENTRY:
     break;
+
   default:
     break;
   }
@@ -195,6 +204,7 @@ editConfiguration (struct GNUNET_CONFIGURATION_Handle *cfg, int option)
   return diffsCB.cfgDiffs;
 }
 
+
 /**
  * Checking configuration diffs
  */
@@ -230,7 +240,8 @@ checkDiffs (struct GNUNET_CONFIGURATION_Handle *cfg_default, int option)
   cfg = GNUNET_CONFIGURATION_create ();
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, diffsFileName));
   if (0 != remove (diffsFileName))
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "remove", diffsFileName);
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "remove",
+                              diffsFileName);
   cbData.callBackOption = COMPARE;
   cbData.cfgDiffs = cfgDiffs;
   GNUNET_CONFIGURATION_iterate (cfg, diffsCallBack, &cbData);
@@ -316,12 +327,8 @@ testConfig ()
     GNUNET_break (0);
     return 8;
   }
-#ifndef MINGW
+
   if (0 != strcmp (c, "/hello/world"))
-#else
-#define HI "\\hello\\world"
-  if (strstr (c, HI) != c + strlen (c) - strlen (HI))
-#endif
   {
     GNUNET_break (0);
     GNUNET_free (c);
@@ -343,6 +350,7 @@ testConfig ()
   return 0;
 }
 
+
 static const char *want[] = {
   "/Hello",
   "/File Name",
@@ -365,6 +373,7 @@ check (void *data, const char *fn)
   return GNUNET_SYSERR;
 }
 
+
 static int
 testConfigFilenames ()
 {
@@ -466,7 +475,7 @@ main (int argc, char *argv[])
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_parse (cfg, "test_configuration_data.conf"))
   {
-    fprintf (stderr, "%s",  "Failed to parse configuration file\n");
+    fprintf (stderr, "%s", "Failed to parse configuration file\n");
     GNUNET_CONFIGURATION_destroy (cfg);
     return 1;
   }
@@ -480,7 +489,7 @@ main (int argc, char *argv[])
 
   if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, "/tmp/gnunet-test.conf"))
   {
-    fprintf (stderr, "%s",  "Failed to write configuration file\n");
+    fprintf (stderr, "%s", "Failed to write configuration file\n");
     GNUNET_CONFIGURATION_destroy (cfg);
     return 1;
   }