diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-06-13 11:44:41 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-06-13 11:44:41 +0000 |
commit | 37ad983d488bb8c62cd26823850ba01ee2e499d7 (patch) | |
tree | 88c3c257bcc06d36b7659d007f3e80d0c6866e24 /src | |
parent | 2749384c8aaa69fbc36ce543a91a2bd725cf0fa7 (diff) | |
download | gnunet-37ad983d488bb8c62cd26823850ba01ee2e499d7.tar.gz gnunet-37ad983d488bb8c62cd26823850ba01ee2e499d7.zip |
fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/fs/gnunet-publish.c | 4 | ||||
-rw-r--r-- | src/peerinfo-tool/gnunet-peerinfo.c | 1 | ||||
-rw-r--r-- | src/util/pseudonym.c | 3 | ||||
-rw-r--r-- | src/util/service.c | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index 055e3c4b4..519f3e35c 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c | |||
@@ -493,6 +493,8 @@ run (void *cls, | |||
493 | _("Failed to parse URI: %s\n"), | 493 | _("Failed to parse URI: %s\n"), |
494 | emsg); | 494 | emsg); |
495 | GNUNET_free (emsg); | 495 | GNUNET_free (emsg); |
496 | if (namespace != NULL) | ||
497 | GNUNET_FS_namespace_delete (namespace, GNUNET_NO); | ||
496 | GNUNET_FS_stop (ctx); | 498 | GNUNET_FS_stop (ctx); |
497 | ret = 1; | 499 | ret = 1; |
498 | return; | 500 | return; |
@@ -507,6 +509,8 @@ run (void *cls, | |||
507 | GNUNET_FS_PUBLISH_OPTION_NONE, | 509 | GNUNET_FS_PUBLISH_OPTION_NONE, |
508 | &uri_ksk_continuation, | 510 | &uri_ksk_continuation, |
509 | NULL); | 511 | NULL); |
512 | if (namespace != NULL) | ||
513 | GNUNET_FS_namespace_delete (namespace, GNUNET_NO); | ||
510 | return; | 514 | return; |
511 | } | 515 | } |
512 | l = NULL; | 516 | l = NULL; |
diff --git a/src/peerinfo-tool/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c index a3fa98fa9..a289569eb 100644 --- a/src/peerinfo-tool/gnunet-peerinfo.c +++ b/src/peerinfo-tool/gnunet-peerinfo.c | |||
@@ -204,6 +204,7 @@ print_peer_info (void *cls, | |||
204 | return; | 204 | return; |
205 | } | 205 | } |
206 | GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &print_address, pc); | 206 | GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &print_address, pc); |
207 | GNUNET_free (pc); | ||
207 | } | 208 | } |
208 | 209 | ||
209 | 210 | ||
diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c index 057befaa6..6693dadd2 100644 --- a/src/util/pseudonym.c +++ b/src/util/pseudonym.c | |||
@@ -243,16 +243,17 @@ read_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
243 | GNUNET_free (fn); | 243 | GNUNET_free (fn); |
244 | return GNUNET_SYSERR; | 244 | return GNUNET_SYSERR; |
245 | } | 245 | } |
246 | emsg = NULL; | ||
246 | if ( (GNUNET_OK != GNUNET_BIO_read_int32 (fileR, ranking)) || | 247 | if ( (GNUNET_OK != GNUNET_BIO_read_int32 (fileR, ranking)) || |
247 | (GNUNET_OK != GNUNET_BIO_read_string(fileR, "Read string error!", ns_name, 200)) || | 248 | (GNUNET_OK != GNUNET_BIO_read_string(fileR, "Read string error!", ns_name, 200)) || |
248 | (GNUNET_OK != GNUNET_BIO_read_meta_data(fileR, "Read meta data error!", meta)) ) | 249 | (GNUNET_OK != GNUNET_BIO_read_meta_data(fileR, "Read meta data error!", meta)) ) |
249 | { | 250 | { |
250 | GNUNET_BIO_read_close(fileR, &emsg); | 251 | GNUNET_BIO_read_close(fileR, &emsg); |
252 | GNUNET_free_non_null (emsg); | ||
251 | GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove (fn)); | 253 | GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove (fn)); |
252 | GNUNET_free (fn); | 254 | GNUNET_free (fn); |
253 | return GNUNET_SYSERR; | 255 | return GNUNET_SYSERR; |
254 | } | 256 | } |
255 | emsg = NULL; | ||
256 | if (GNUNET_OK != GNUNET_BIO_read_close(fileR, &emsg)) | 257 | if (GNUNET_OK != GNUNET_BIO_read_close(fileR, &emsg)) |
257 | { | 258 | { |
258 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 259 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
diff --git a/src/util/service.c b/src/util/service.c index d59b0c0ff..463b88999 100644 --- a/src/util/service.c +++ b/src/util/service.c | |||
@@ -877,6 +877,7 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName, | |||
877 | (errno == ENOMEM) || (errno == ENFILE) || (errno == EACCES)) | 877 | (errno == ENOMEM) || (errno == ENFILE) || (errno == EACCES)) |
878 | { | 878 | { |
879 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket"); | 879 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket"); |
880 | GNUNET_free_non_null (hostname); | ||
880 | return GNUNET_SYSERR; | 881 | return GNUNET_SYSERR; |
881 | } | 882 | } |
882 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 883 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |