From 78e6e273af9fbf0f66781464a997fe130fbd89e1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 29 Oct 2009 16:36:54 +0000 Subject: [PATCH] fix --- src/util/container_heap.c | 2 +- src/util/test_common_logging.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/util/container_heap.c b/src/util/container_heap.c index 8c3cb41aa..efe968e82 100644 --- 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 8a9b73108..e3209082b 100644 --- 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"); -- 2.25.1