[GNUnet-SVN] r9342 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2009-10-29 10:36:54 -0600 (Thu, 29 Oct 2009)
New Revision: 9342

Modified:
   gnunet/src/util/container_heap.c
   gnunet/src/util/test_common_logging.c
Log:
fix

Modified: gnunet/src/util/container_heap.c
===================================================================
--- gnunet/src/util/container_heap.c    2009-10-29 14:58:11 UTC (rev 9341)
+++ gnunet/src/util/container_heap.c    2009-10-29 16:36:54 UTC (rev 9342)
@@ -146,7 +146,7 @@
   return;
 }
 
-struct GNUNET_CONTAINER_heap_node *
+static struct GNUNET_CONTAINER_heap_node *
 find_element (struct GNUNET_CONTAINER_heap_node *node, void *element)
 {
   struct GNUNET_CONTAINER_heap_node *ret;

Modified: gnunet/src/util/test_common_logging.c
===================================================================
--- gnunet/src/util/test_common_logging.c       2009-10-29 14:58:11 UTC (rev 
9341)
+++ gnunet/src/util/test_common_logging.c       2009-10-29 16:36:54 UTC (rev 
9342)
@@ -42,13 +42,7 @@
   unsigned int failureCount = 0;
   unsigned int logs = 0;
 
-  /* FIXME: this causes a double free, because common_logging sets
-   * GNUNET_stderr = stderr before main() gets executed and then tries
-   * to fclose(GNUNET_stderr) in GNUNET_log_setup */
-  fclose (stderr);
-#ifndef MINGW
-  stderr = NULL;
-#endif
+  GNUNET_log_setup ("test-common-logging", "DEBUG", "/dev/null");
   GNUNET_logger_add (&my_log, &logs);
   GNUNET_logger_add (&my_log, &logs);
   GNUNET_log (GNUNET_ERROR_TYPE_BULK, "Testing...\n");