dhtlog updates

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

diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index 3b34beedf3f6fe544dc53f17370f7dc1ec44db4a..550ea0b39c2d945ee64435f7aed3e6b0b33d32cc 100644 (file)
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -38,13 +38,13 @@
 static char *test_phrase = "HELLO WORLD";
 static int ok;
 
-pid_t pid;
+static pid_t pid;
 /* Pipe to write to started processes stdin (on write end) */
-struct GNUNET_DISK_PipeHandle *hello_pipe_stdin;
+static struct GNUNET_DISK_PipeHandle *hello_pipe_stdin;
 /* Pipe to read from started processes stdout (on read end) */
-struct GNUNET_DISK_PipeHandle *hello_pipe_stdout;
+static struct GNUNET_DISK_PipeHandle *hello_pipe_stdout;
 
-GNUNET_SCHEDULER_TaskIdentifier die_task;
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
 static void
 end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -74,6 +74,7 @@ read_call (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   if (bytes < 1)
     {
+      GNUNET_break (0);
       ok = 1;
       GNUNET_SCHEDULER_cancel(tc->sched, die_task);
       GNUNET_SCHEDULER_add_now(tc->sched, &end_task, NULL);
@@ -103,7 +104,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   char *fn;
   const struct GNUNET_DISK_FileHandle *stdout_read_handle;
-  struct GNUNET_DISK_FileHandle *wh;
+  const struct GNUNET_DISK_FileHandle *wh;
 
   GNUNET_asprintf(&fn, "cat");
 
@@ -112,6 +113,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   if ((hello_pipe_stdout == NULL) || (hello_pipe_stdin == NULL))
     {
+      GNUNET_break (0);
       ok = 1;
       GNUNET_free (fn);
       return;
@@ -129,8 +131,9 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   wh = GNUNET_DISK_pipe_handle (hello_pipe_stdin, GNUNET_DISK_PIPE_END_WRITE);
 
   /* Write the test_phrase to the cat process */
-  if (GNUNET_DISK_file_write(wh, test_phrase, strlen(test_phrase) + 1) != GNUNET_YES)
+  if (GNUNET_DISK_file_write(wh, test_phrase, strlen(test_phrase) + 1) != strlen(test_phrase) + 1)
     {
+      GNUNET_break (0);
       ok = 1;
       return;
     }
@@ -166,7 +169,7 @@ main (int argc, char *argv[])
 {
   int ret;
 
-  GNUNET_log_setup ("test-start-process",
+  GNUNET_log_setup ("test-os-start-process",
 #if VERBOSE
                     "DEBUG",
 #else