diff options
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/common_allocation.c | 2 | ||||
-rw-r--r-- | src/util/container_slist.c | 9 | ||||
-rw-r--r-- | src/util/network.c | 3 | ||||
-rw-r--r-- | src/util/test_container_slist.c | 4 |
4 files changed, 15 insertions, 3 deletions
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c index 4c1d53c2d..1e546b962 100644 --- a/src/util/common_allocation.c +++ b/src/util/common_allocation.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #define INT_MAX 0x7FFFFFFF | 31 | #define INT_MAX 0x7FFFFFFF |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | #ifdef MINGW | 34 | #if 0 |
35 | #define W32_MEM_LIMIT 200000000 | 35 | #define W32_MEM_LIMIT 200000000 |
36 | #endif | 36 | #endif |
37 | 37 | ||
diff --git a/src/util/container_slist.c b/src/util/container_slist.c index 4f5607a28..715dcee32 100644 --- a/src/util/container_slist.c +++ b/src/util/container_slist.c | |||
@@ -332,4 +332,13 @@ GNUNET_CONTAINER_slist_get (const struct GNUNET_CONTAINER_SList_Iterator *i, | |||
332 | return i->elem->elem; | 332 | return i->elem->elem; |
333 | } | 333 | } |
334 | 334 | ||
335 | /** | ||
336 | * Release an iterator | ||
337 | * @param i iterator | ||
338 | */ | ||
339 | void GNUNET_CONTAINER_slist_iter_destroy (struct GNUNET_CONTAINER_SList_Iterator *i) | ||
340 | { | ||
341 | GNUNET_free (i); | ||
342 | } | ||
343 | |||
335 | /* end of container_slist.c */ | 344 | /* end of container_slist.c */ |
diff --git a/src/util/network.c b/src/util/network.c index a16380736..361012d77 100644 --- a/src/util/network.c +++ b/src/util/network.c | |||
@@ -666,6 +666,7 @@ GNUNET_NETWORK_fdset_copy (struct GNUNET_NETWORK_FDSet *to, | |||
666 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | 666 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, |
667 | handle, len); | 667 | handle, len); |
668 | } | 668 | } |
669 | GNUNET_CONTAINER_slist_iter_destroy (iter); | ||
669 | #endif /* */ | 670 | #endif /* */ |
670 | } | 671 | } |
671 | 672 | ||
@@ -954,6 +955,7 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds, | |||
954 | on_next = GNUNET_YES; | 955 | on_next = GNUNET_YES; |
955 | } | 956 | } |
956 | } | 957 | } |
958 | GNUNET_CONTAINER_slist_iter_destroy (i); | ||
957 | } | 959 | } |
958 | 960 | ||
959 | /* Poll for faulty pipes */ | 961 | /* Poll for faulty pipes */ |
@@ -982,6 +984,7 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds, | |||
982 | else | 984 | else |
983 | on_next = GNUNET_NO; | 985 | on_next = GNUNET_NO; |
984 | } | 986 | } |
987 | GNUNET_CONTAINER_slist_iter_destroy (i); | ||
985 | } | 988 | } |
986 | 989 | ||
987 | /* FIXME */ | 990 | /* FIXME */ |
diff --git a/src/util/test_container_slist.c b/src/util/test_container_slist.c index bc134d26a..3f3b489e9 100644 --- a/src/util/test_container_slist.c +++ b/src/util/test_container_slist.c | |||
@@ -68,7 +68,7 @@ main (int argc, char *argv[]) | |||
68 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | 68 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, |
69 | &j, sizeof (j)); | 69 | &j, sizeof (j)); |
70 | } | 70 | } |
71 | GNUNET_free (it); | 71 | GNUNET_CONTAINER_slist_iter_destroy (it); |
72 | CHECK (GNUNET_CONTAINER_slist_count (l) == 200); | 72 | CHECK (GNUNET_CONTAINER_slist_count (l) == 200); |
73 | i = 198; | 73 | i = 198; |
74 | CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i))); | 74 | CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i))); |
@@ -93,7 +93,7 @@ main (int argc, char *argv[]) | |||
93 | 93 | ||
94 | GNUNET_CONTAINER_slist_erase (it); | 94 | GNUNET_CONTAINER_slist_erase (it); |
95 | } | 95 | } |
96 | GNUNET_free (it); | 96 | GNUNET_CONTAINER_slist_iter_destroy (it); |
97 | CHECK (GNUNET_CONTAINER_slist_count (l) == 100); | 97 | CHECK (GNUNET_CONTAINER_slist_count (l) == 100); |
98 | i = 99; | 98 | i = 99; |
99 | CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_NO); | 99 | CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_NO); |