diff options
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/gnunet-config.c | 2 | ||||
-rw-r--r-- | src/util/gnunet-ecc.c | 2 | ||||
-rw-r--r-- | src/util/gnunet-resolver.c | 12 | ||||
-rw-r--r-- | src/util/gnunet-scrypt.c | 2 | ||||
-rw-r--r-- | src/util/gnunet-uri.c | 2 | ||||
-rw-r--r-- | src/util/os_priority.c | 2 | ||||
-rw-r--r-- | src/util/scheduler.c | 10 | ||||
-rw-r--r-- | src/util/test_common_allocation.c | 26 |
8 files changed, 41 insertions, 17 deletions
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c index f101e8b61..5883c1497 100644 --- a/src/util/gnunet-config.c +++ b/src/util/gnunet-config.c | |||
@@ -331,7 +331,7 @@ main (int argc, char *const *argv) | |||
331 | options, | 331 | options, |
332 | &run, | 332 | &run, |
333 | NULL); | 333 | NULL); |
334 | GNUNET_free ((void *) argv); | 334 | GNUNET_free_nz ((void *) argv); |
335 | if (GNUNET_OK == ret) | 335 | if (GNUNET_OK == ret) |
336 | return global_ret; | 336 | return global_ret; |
337 | return ret; | 337 | return ret; |
diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c index 764a507b6..8e30ac416 100644 --- a/src/util/gnunet-ecc.c +++ b/src/util/gnunet-ecc.c | |||
@@ -501,7 +501,7 @@ main (int argc, char *const *argv) | |||
501 | NULL)) | 501 | NULL)) |
502 | ? 0 | 502 | ? 0 |
503 | : 1; | 503 | : 1; |
504 | GNUNET_free ((void *) argv); | 504 | GNUNET_free_nz ((void *) argv); |
505 | return ret; | 505 | return ret; |
506 | } | 506 | } |
507 | 507 | ||
diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c index 6a602c64e..8a6c7fbe9 100644 --- a/src/util/gnunet-resolver.c +++ b/src/util/gnunet-resolver.c | |||
@@ -171,14 +171,18 @@ main (int argc, char *const *argv) | |||
171 | }; | 171 | }; |
172 | int ret; | 172 | int ret; |
173 | 173 | ||
174 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 174 | if (GNUNET_OK != |
175 | GNUNET_STRINGS_get_utf8_args (argc, argv, | ||
176 | &argc, &argv)) | ||
175 | return 2; | 177 | return 2; |
176 | 178 | ||
177 | ret = (GNUNET_OK == | 179 | ret = (GNUNET_OK == |
178 | GNUNET_PROGRAM_run (argc, argv, "gnunet-resolver [hostname]", | 180 | GNUNET_PROGRAM_run (argc, argv, |
181 | "gnunet-resolver [hostname]", | ||
179 | gettext_noop ("Use build-in GNUnet stub resolver"), | 182 | gettext_noop ("Use build-in GNUnet stub resolver"), |
180 | options, &run, NULL)) ? 0 : 1; | 183 | options, |
181 | GNUNET_free ((void *) argv); | 184 | &run, NULL)) ? 0 : 1; |
185 | GNUNET_free_nz ((void *) argv); | ||
182 | return ret; | 186 | return ret; |
183 | } | 187 | } |
184 | 188 | ||
diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c index 8c46136b9..70ba48d82 100644 --- a/src/util/gnunet-scrypt.c +++ b/src/util/gnunet-scrypt.c | |||
@@ -322,7 +322,7 @@ main (int argc, char *const *argv) | |||
322 | NULL)) | 322 | NULL)) |
323 | ? 0 | 323 | ? 0 |
324 | : 1; | 324 | : 1; |
325 | GNUNET_free ((void *) argv); | 325 | GNUNET_free_nz ((void *) argv); |
326 | GNUNET_free_non_null (pwfn); | 326 | GNUNET_free_non_null (pwfn); |
327 | return ret; | 327 | return ret; |
328 | } | 328 | } |
diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c index 84100ff56..48c46ee49 100644 --- a/src/util/gnunet-uri.c +++ b/src/util/gnunet-uri.c | |||
@@ -184,7 +184,7 @@ main (int argc, char *const *argv) | |||
184 | shc_chld = NULL; | 184 | shc_chld = NULL; |
185 | GNUNET_DISK_pipe_close (sigpipe); | 185 | GNUNET_DISK_pipe_close (sigpipe); |
186 | sigpipe = NULL; | 186 | sigpipe = NULL; |
187 | GNUNET_free ((void *) argv); | 187 | GNUNET_free_nz ((void *) argv); |
188 | return ((GNUNET_OK == ret) && (0 == exit_code)) ? 0 : 1; | 188 | return ((GNUNET_OK == ret) && (0 == exit_code)) ? 0 : 1; |
189 | } | 189 | } |
190 | 190 | ||
diff --git a/src/util/os_priority.c b/src/util/os_priority.c index 36f0d8e30..5799d893b 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c | |||
@@ -875,7 +875,7 @@ GNUNET_OS_start_process_s (int pipe_control, | |||
875 | binary_path, | 875 | binary_path, |
876 | argv); | 876 | argv); |
877 | while (argv_size > 0) | 877 | while (argv_size > 0) |
878 | GNUNET_free (argv[--argv_size]); | 878 | GNUNET_free_nz (argv[--argv_size]); |
879 | GNUNET_free (argv); | 879 | GNUNET_free (argv); |
880 | return proc; | 880 | return proc; |
881 | } | 881 | } |
diff --git a/src/util/scheduler.c b/src/util/scheduler.c index 45a6b61e5..93393bd7c 100644 --- a/src/util/scheduler.c +++ b/src/util/scheduler.c | |||
@@ -584,28 +584,26 @@ dump_backtrace (struct GNUNET_SCHEDULER_Task *t) | |||
584 | static void | 584 | static void |
585 | destroy_task (struct GNUNET_SCHEDULER_Task *t) | 585 | destroy_task (struct GNUNET_SCHEDULER_Task *t) |
586 | { | 586 | { |
587 | unsigned int i; | ||
588 | |||
589 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 587 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
590 | "destroying task %p\n", | 588 | "destroying task %p\n", |
591 | t); | 589 | t); |
592 | 590 | ||
593 | if (GNUNET_YES == t->own_handles) | 591 | if (GNUNET_YES == t->own_handles) |
594 | { | 592 | { |
595 | for (i = 0; i != t->fds_len; ++i) | 593 | for (unsigned int i = 0; i != t->fds_len; ++i) |
596 | { | 594 | { |
597 | const struct GNUNET_NETWORK_Handle *fd = t->fds[i].fd; | 595 | const struct GNUNET_NETWORK_Handle *fd = t->fds[i].fd; |
598 | const struct GNUNET_DISK_FileHandle *fh = t->fds[i].fh; | 596 | const struct GNUNET_DISK_FileHandle *fh = t->fds[i].fh; |
599 | if (fd) | 597 | if (fd) |
600 | { | 598 | { |
601 | GNUNET_NETWORK_socket_free_memory_only_ ((struct | 599 | GNUNET_NETWORK_socket_free_memory_only_ ( |
602 | GNUNET_NETWORK_Handle *) fd); | 600 | (struct GNUNET_NETWORK_Handle *) fd); |
603 | } | 601 | } |
604 | if (fh) | 602 | if (fh) |
605 | { | 603 | { |
606 | // FIXME: on WIN32 this is not enough! A function | 604 | // FIXME: on WIN32 this is not enough! A function |
607 | // GNUNET_DISK_file_free_memory_only would be nice | 605 | // GNUNET_DISK_file_free_memory_only would be nice |
608 | GNUNET_free ((void *) fh); | 606 | GNUNET_free_nz ((void *) fh); |
609 | } | 607 | } |
610 | } | 608 | } |
611 | } | 609 | } |
diff --git a/src/util/test_common_allocation.c b/src/util/test_common_allocation.c index e2fc29e82..a24af7124 100644 --- a/src/util/test_common_allocation.c +++ b/src/util/test_common_allocation.c | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | 28 | ||
29 | static int | 29 | static int |
30 | check () | 30 | check (void) |
31 | { | 31 | { |
32 | #define MAX_TESTVAL 1024 | 32 | #define MAX_TESTVAL 1024 |
33 | char *ptrs[MAX_TESTVAL]; | 33 | char *ptrs[MAX_TESTVAL]; |
@@ -134,6 +134,28 @@ check () | |||
134 | } | 134 | } |
135 | 135 | ||
136 | 136 | ||
137 | static int | ||
138 | check2 (void) | ||
139 | { | ||
140 | char *a1 = NULL; | ||
141 | unsigned int a1_len = 0; | ||
142 | const char *a2 = "test"; | ||
143 | |||
144 | GNUNET_array_append (a1, | ||
145 | a1_len, | ||
146 | 'x'); | ||
147 | GNUNET_array_concatenate (a1, | ||
148 | a1_len, | ||
149 | a2, | ||
150 | 4); | ||
151 | GNUNET_assert (0 == strncmp ("xtest", | ||
152 | a1, | ||
153 | 5)); | ||
154 | GNUNET_assert (5 == a1_len); | ||
155 | return 0; | ||
156 | } | ||
157 | |||
158 | |||
137 | int | 159 | int |
138 | main (int argc, char *argv[]) | 160 | main (int argc, char *argv[]) |
139 | { | 161 | { |
@@ -142,7 +164,7 @@ main (int argc, char *argv[]) | |||
142 | GNUNET_log_setup ("test-common-allocation", | 164 | GNUNET_log_setup ("test-common-allocation", |
143 | "WARNING", | 165 | "WARNING", |
144 | NULL); | 166 | NULL); |
145 | ret = check (); | 167 | ret = check () | check2 (); |
146 | if (ret != 0) | 168 | if (ret != 0) |
147 | fprintf (stderr, | 169 | fprintf (stderr, |
148 | "ERROR %d.\n", | 170 | "ERROR %d.\n", |