fix

diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index 8c3cb41aa230edc905ebb6ab1d808efa2bdeecdb..efe968e82f4098ff2266a66130ab06d1bcbc07c4 100644 (file)
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -146,7 +146,7 @@ GNUNET_CONTAINER_heap_destroy (struct GNUNET_CONTAINER_Heap *heap)
   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;

diff --git a/src/util/test_common_logging.c b/src/util/test_common_logging.c
index 8a9b73108fcbcc9ddad9b9d8a9409b891ad08fda..e3209082bfcf3a9616bd04f4cf5b86cccb7775d4 100644 (file)
--- a/src/util/test_common_logging.c
+++ b/src/util/test_common_logging.c
@@ -42,13 +42,7 @@ main (int argc, char *argv[])
   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");