diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-06-17 21:56:21 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-06-17 21:56:21 +0000 |
commit | 5bb4b33bf7cc18112ce1770e0012096e7bb9426b (patch) | |
tree | 5c941ed913af03aef6b13018555a05a04ea4f94e /src/fs/fs_directory.c | |
parent | bed39036b47e1b820ee40d645f743e18520c4f8c (diff) | |
download | gnunet-5bb4b33bf7cc18112ce1770e0012096e7bb9426b.tar.gz gnunet-5bb4b33bf7cc18112ce1770e0012096e7bb9426b.zip |
fixes
Diffstat (limited to 'src/fs/fs_directory.c')
-rw-r--r-- | src/fs/fs_directory.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c index 9c13073ab..fca2fc786 100644 --- a/src/fs/fs_directory.c +++ b/src/fs/fs_directory.c | |||
@@ -401,16 +401,24 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld, | |||
401 | 401 | ||
402 | GNUNET_assert (! GNUNET_FS_uri_test_ksk (uri)); | 402 | GNUNET_assert (! GNUNET_FS_uri_test_ksk (uri)); |
403 | if (NULL != data) | 403 | if (NULL != data) |
404 | if (GNUNET_FS_uri_test_chk (uri)) | 404 | { |
405 | fsize = GNUNET_FS_uri_chk_get_file_size (uri); | 405 | GNUNET_assert (! GNUNET_FS_uri_test_sks (uri)); |
406 | else | 406 | if (GNUNET_FS_uri_test_chk (uri)) |
407 | { | 407 | { |
408 | curi = GNUNET_FS_uri_loc_get_uri (uri); | 408 | fsize = GNUNET_FS_uri_chk_get_file_size (uri); |
409 | fsize = GNUNET_FS_uri_chk_get_file_size (curi); | 409 | } |
410 | GNUNET_FS_uri_destroy (curi); | 410 | else |
411 | } | 411 | { |
412 | curi = GNUNET_FS_uri_loc_get_uri (uri); | ||
413 | GNUNET_assert (NULL != curi); | ||
414 | fsize = GNUNET_FS_uri_chk_get_file_size (curi); | ||
415 | GNUNET_FS_uri_destroy (curi); | ||
416 | } | ||
417 | } | ||
412 | else | 418 | else |
413 | fsize = 0; /* not given */ | 419 | { |
420 | fsize = 0; /* not given */ | ||
421 | } | ||
414 | if (fsize > MAX_INLINE_SIZE) | 422 | if (fsize > MAX_INLINE_SIZE) |
415 | fsize = 0; /* too large */ | 423 | fsize = 0; /* too large */ |
416 | uris = GNUNET_FS_uri_to_string (uri); | 424 | uris = GNUNET_FS_uri_to_string (uri); |