diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-10-29 16:36:54 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-10-29 16:36:54 +0000 |
commit | 78e6e273af9fbf0f66781464a997fe130fbd89e1 (patch) | |
tree | a4e99108ebaad6cb8270b27a52f17f01f42e2d93 | |
parent | 5e73fcf9efb7ec0d0edd62c956a1f62f108b1b06 (diff) | |
download | gnunet-78e6e273af9fbf0f66781464a997fe130fbd89e1.tar.gz gnunet-78e6e273af9fbf0f66781464a997fe130fbd89e1.zip |
fix
-rw-r--r-- | src/util/container_heap.c | 2 | ||||
-rw-r--r-- | 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) | |||
146 | return; | 146 | return; |
147 | } | 147 | } |
148 | 148 | ||
149 | struct GNUNET_CONTAINER_heap_node * | 149 | static struct GNUNET_CONTAINER_heap_node * |
150 | find_element (struct GNUNET_CONTAINER_heap_node *node, void *element) | 150 | find_element (struct GNUNET_CONTAINER_heap_node *node, void *element) |
151 | { | 151 | { |
152 | struct GNUNET_CONTAINER_heap_node *ret; | 152 | 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[]) | |||
42 | unsigned int failureCount = 0; | 42 | unsigned int failureCount = 0; |
43 | unsigned int logs = 0; | 43 | unsigned int logs = 0; |
44 | 44 | ||
45 | /* FIXME: this causes a double free, because common_logging sets | 45 | GNUNET_log_setup ("test-common-logging", "DEBUG", "/dev/null"); |
46 | * GNUNET_stderr = stderr before main() gets executed and then tries | ||
47 | * to fclose(GNUNET_stderr) in GNUNET_log_setup */ | ||
48 | fclose (stderr); | ||
49 | #ifndef MINGW | ||
50 | stderr = NULL; | ||
51 | #endif | ||
52 | GNUNET_logger_add (&my_log, &logs); | 46 | GNUNET_logger_add (&my_log, &logs); |
53 | GNUNET_logger_add (&my_log, &logs); | 47 | GNUNET_logger_add (&my_log, &logs); |
54 | GNUNET_log (GNUNET_ERROR_TYPE_BULK, "Testing...\n"); | 48 | GNUNET_log (GNUNET_ERROR_TYPE_BULK, "Testing...\n"); |