diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-08-07 14:36:50 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-08-07 14:36:50 +0000 |
commit | 7fe7a62cd2303bf7b3ec22d44fa2071418265297 (patch) | |
tree | 9052a6a3f2af3ae4036fea8fe24a9d7cd60e0099 /src/fs/fs_namespace.c | |
parent | 523ae9cc3ca9055543b676cb0f1c2c1ef7f46ac4 (diff) | |
download | gnunet-7fe7a62cd2303bf7b3ec22d44fa2071418265297.tar.gz gnunet-7fe7a62cd2303bf7b3ec22d44fa2071418265297.zip |
-fix W32 FTBFS
Diffstat (limited to 'src/fs/fs_namespace.c')
-rw-r--r-- | src/fs/fs_namespace.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c index 8537ba0e6..1aca144e1 100644 --- a/src/fs/fs_namespace.c +++ b/src/fs/fs_namespace.c | |||
@@ -268,19 +268,15 @@ read_update_information_graph (struct GNUNET_FS_Handle *h, | |||
268 | if (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &count)) | 268 | if (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &count)) |
269 | { | 269 | { |
270 | GNUNET_break (0); | 270 | GNUNET_break (0); |
271 | goto ERROR; | 271 | goto END; |
272 | } | 272 | } |
273 | if (count > 1024 * 1024) | 273 | if (count > 1024 * 1024) |
274 | { | 274 | { |
275 | GNUNET_break (0); | 275 | GNUNET_break (0); |
276 | goto ERROR; | 276 | goto END; |
277 | } | 277 | } |
278 | if (0 == count) | 278 | if (0 == count) |
279 | { | 279 | goto END; |
280 | GNUNET_break (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL)); | ||
281 | GNUNET_free (fn); | ||
282 | return uig; | ||
283 | } | ||
284 | uig->update_nodes = | 280 | uig->update_nodes = |
285 | GNUNET_malloc (count * sizeof (struct NamespaceUpdateNode *)); | 281 | GNUNET_malloc (count * sizeof (struct NamespaceUpdateNode *)); |
286 | 282 | ||
@@ -316,14 +312,7 @@ read_update_information_graph (struct GNUNET_FS_Handle *h, | |||
316 | uig->update_nodes[i] = n; | 312 | uig->update_nodes[i] = n; |
317 | } | 313 | } |
318 | uig->update_node_count = i; | 314 | uig->update_node_count = i; |
319 | if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) | 315 | END: |
320 | { | ||
321 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to read `%s': %s\n"), | ||
322 | fn, emsg); | ||
323 | GNUNET_free (emsg); | ||
324 | } | ||
325 | return uig; | ||
326 | ERROR: | ||
327 | if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) | 316 | if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) |
328 | { | 317 | { |
329 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to read `%s': %s\n"), | 318 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to read `%s': %s\n"), |