-indentation

[oweals/gnunet.git] / src / testbed / gnunet-helper-testbed.c

diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index 42a4596362f656bec17d5b0ac85424c063a89d3b..6937d7262e676c4b19818a677de38a99b0369acf 100644 (file)
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -406,9 +406,9 @@ tokenizer_cb (void *cls, void *client,
   evstr = getenv (GNUNET_TESTING_PREFIX);
   if (NULL != evstr)
   {
-#ifdef WINDOWS
     /* unsetting the variable will invalidate the pointer! */
     evstr = GNUNET_strdup (evstr);
+#ifdef WINDOWS
     GNUNET_break (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, NULL));
 #else
     GNUNET_break (0 == unsetenv (GNUNET_TESTING_PREFIX));
@@ -421,7 +421,6 @@ tokenizer_cb (void *cls, void *client,
   {
 #ifdef WINDOWS
     GNUNET_assert (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, evstr));
-    GNUNET_free (evstr);
 #else
     static char evar[2* PATH_MAX];
 
@@ -429,7 +428,7 @@ tokenizer_cb (void *cls, void *client,
                                         GNUNET_TESTING_PREFIX "=%s", evstr));
     putenv (evar);
 #endif
-    /* do not free evstr */
+    GNUNET_free (evstr);
     evstr = NULL;
   }
   GNUNET_free_non_null (hostname);
@@ -462,8 +461,9 @@ tokenizer_cb (void *cls, void *client,
   }
   testbed =
       GNUNET_OS_start_process (PIPE_CONTROL,
-                               GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL,
-                               NULL, binary, "gnunet-service-testbed", "-c",
+                               GNUNET_OS_INHERIT_STD_ERR /*verbose? */ ,
+                               NULL, NULL, NULL,
+                               binary, "gnunet-service-testbed", "-c",
                                config, NULL);
   GNUNET_free (binary);
   GNUNET_free (config);
@@ -481,7 +481,7 @@ tokenizer_cb (void *cls, void *client,
   xconfig_size =
       GNUNET_TESTBED_compress_config_ (config, config_size, &xconfig);
   GNUNET_free (config);
-  wc = GNUNET_malloc (sizeof (struct WriteContext));
+  wc = GNUNET_new (struct WriteContext);
   wc->length = xconfig_size + sizeof (struct GNUNET_TESTBED_HelperReply);
   reply = GNUNET_realloc (xconfig, wc->length);
   memmove (&reply[1], reply, xconfig_size);