diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-06 12:13:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-06 12:13:03 +0000 |
commit | 00f8889c5fb82a76295d9c0045e63b6bd274b5fb (patch) | |
tree | 985d20e8e696f090fe77b6a6d1032895d25d9b5d /src/regex | |
parent | 8675d5f1a8906b4255562f878e140acc0ee8fafc (diff) | |
download | gnunet-00f8889c5fb82a76295d9c0045e63b6bd274b5fb.tar.gz gnunet-00f8889c5fb82a76295d9c0045e63b6bd274b5fb.zip |
-cleanup leaks
Diffstat (limited to 'src/regex')
-rw-r--r-- | src/regex/gnunet-daemon-regexprofiler.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/regex/gnunet-daemon-regexprofiler.c b/src/regex/gnunet-daemon-regexprofiler.c index 685457973..e39a9de93 100644 --- a/src/regex/gnunet-daemon-regexprofiler.c +++ b/src/regex/gnunet-daemon-regexprofiler.c | |||
@@ -277,10 +277,7 @@ run (void *cls, char *const *args GNUNET_UNUSED, | |||
277 | GNUNET_CONFIGURATION_get_value_string (cfg, "REGEXPROFILER", | 277 | GNUNET_CONFIGURATION_get_value_string (cfg, "REGEXPROFILER", |
278 | "POLICY_DIR", &policy_dir)) | 278 | "POLICY_DIR", &policy_dir)) |
279 | { | 279 | { |
280 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 280 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "REGEXPROFILER", "POLICY_DIR"); |
281 | _ | ||
282 | ("%s service is lacking key configuration settings (%s). Exiting.\n"), | ||
283 | "regexprofiler", "policy_dir"); | ||
284 | global_ret = GNUNET_SYSERR; | 281 | global_ret = GNUNET_SYSERR; |
285 | GNUNET_SCHEDULER_shutdown (); | 282 | GNUNET_SCHEDULER_shutdown (); |
286 | return; | 283 | return; |
@@ -289,11 +286,9 @@ run (void *cls, char *const *args GNUNET_UNUSED, | |||
289 | GNUNET_CONFIGURATION_get_value_number (cfg, "TESTBED", | 286 | GNUNET_CONFIGURATION_get_value_number (cfg, "TESTBED", |
290 | "PEERID", &peer_id)) | 287 | "PEERID", &peer_id)) |
291 | { | 288 | { |
292 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 289 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "TESTBED", "PEERID"); |
293 | _ | ||
294 | ("%s service is lacking key configuration settings (%s). Exiting.\n"), | ||
295 | "regexprofiler", "policy_file"); | ||
296 | global_ret = GNUNET_SYSERR; | 290 | global_ret = GNUNET_SYSERR; |
291 | GNUNET_free (policy_dir); | ||
297 | GNUNET_SCHEDULER_shutdown (); | 292 | GNUNET_SCHEDULER_shutdown (); |
298 | return; | 293 | return; |
299 | } | 294 | } |
@@ -302,11 +297,9 @@ run (void *cls, char *const *args GNUNET_UNUSED, | |||
302 | GNUNET_CONFIGURATION_get_value_string (cfg, "REGEXPROFILER", | 297 | GNUNET_CONFIGURATION_get_value_string (cfg, "REGEXPROFILER", |
303 | "REGEX_PREFIX", ®ex_prefix)) | 298 | "REGEX_PREFIX", ®ex_prefix)) |
304 | { | 299 | { |
305 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 300 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "REGEXPROFILER", "REGEX_PREFIX"); |
306 | _ | ||
307 | ("%s service is lacking key configuration settings (%s). Exiting.\n"), | ||
308 | "regexprofiler", "regex_prefix"); | ||
309 | global_ret = GNUNET_SYSERR; | 301 | global_ret = GNUNET_SYSERR; |
302 | GNUNET_free (policy_dir); | ||
310 | GNUNET_SCHEDULER_shutdown (); | 303 | GNUNET_SCHEDULER_shutdown (); |
311 | return; | 304 | return; |
312 | } | 305 | } |
@@ -331,6 +324,7 @@ run (void *cls, char *const *args GNUNET_UNUSED, | |||
331 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 324 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
332 | "Could not acquire dht handle. Exiting.\n"); | 325 | "Could not acquire dht handle. Exiting.\n"); |
333 | global_ret = GNUNET_SYSERR; | 326 | global_ret = GNUNET_SYSERR; |
327 | GNUNET_free (policy_dir); | ||
334 | GNUNET_SCHEDULER_shutdown (); | 328 | GNUNET_SCHEDULER_shutdown (); |
335 | return; | 329 | return; |
336 | } | 330 | } |
@@ -344,9 +338,11 @@ run (void *cls, char *const *args GNUNET_UNUSED, | |||
344 | "Policy file %s contains no policies. Exiting.\n", | 338 | "Policy file %s contains no policies. Exiting.\n", |
345 | policy_filename); | 339 | policy_filename); |
346 | global_ret = GNUNET_SYSERR; | 340 | global_ret = GNUNET_SYSERR; |
341 | GNUNET_free (policy_dir); | ||
347 | GNUNET_SCHEDULER_shutdown (); | 342 | GNUNET_SCHEDULER_shutdown (); |
348 | return; | 343 | return; |
349 | } | 344 | } |
345 | GNUNET_free (policy_dir); | ||
350 | regex = REGEX_TEST_combine (components); | 346 | regex = REGEX_TEST_combine (components); |
351 | REGEX_TEST_free_from_file (components); | 347 | REGEX_TEST_free_from_file (components); |
352 | 348 | ||