X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_common_logging.c;h=62acbfd1c9b499888627c96bdd6e1d49986d3d16;hb=265d10682af1afce58988be998d62e1849a3e545;hp=cf291161ed3e7bcc48907aa59a5b391be6ff2999;hpb=83b19539f4d322b43683f5838b72e9ec2c8e6073;p=oweals%2Fgnunet.git

diff --git a/src/util/test_common_logging.c b/src/util/test_common_logging.c
index cf291161e..62acbfd1c 100644
--- a/src/util/test_common_logging.c
+++ b/src/util/test_common_logging.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2008 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2008 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
 
 static void
 my_log (void *ctx, enum GNUNET_ErrorType kind, const char *component,
@@ -43,8 +43,8 @@ main (int argc, char *argv[])
   unsigned int failureCount = 0;
   unsigned int logs = 0;
 
-  if (0 != setenv ("GNUNET_FORCE_LOG", "", 1))
-    fprintf (stderr, "Failed to setenv: %s\n", strerror (errno));
+  if (0 != putenv ("GNUNET_FORCE_LOG="))
+    FPRINTF (stderr, "Failed to putenv: %s\n", strerror (errno));
   GNUNET_log_setup ("test-common-logging", "DEBUG", "/dev/null");
   GNUNET_logger_add (&my_log, &logs);
   GNUNET_logger_add (&my_log, &logs);
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
   GNUNET_logger_remove (&my_log, &logs);
   if (logs != 4)
   {
-    fprintf (stdout, "Expected 4 log calls, got %u\n", logs);
+    FPRINTF (stdout, "Expected 4 log calls, got %u\n", logs);
     failureCount++;
   }
   GNUNET_break (0 ==
@@ -84,13 +84,13 @@ main (int argc, char *argv[])
   GNUNET_logger_remove (&my_log, &logs);
   if (logs != 1)
   {
-    fprintf (stdout, "Expected 1 log call, got %u\n", logs);
+    FPRINTF (stdout, "Expected 1 log call, got %u\n", logs);
     failureCount++;
   }
 
   if (failureCount != 0)
   {
-    fprintf (stdout, "%u TESTS FAILED!\n", failureCount);
+    FPRINTF (stdout, "%u TESTS FAILED!\n", failureCount);
     return -1;
   }
   return 0;