From 0ec759513a49b4219d6a6b235ecca50c123a6522 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 18 Feb 2012 21:57:14 +0000 Subject: [PATCH] -sync after getting URI on publishing to resume properly; also bugfix... --- src/fs/fs_api.c | 12 ++++++------ src/fs/fs_publish.c | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index b930f35bd..67be447f6 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c @@ -676,13 +676,13 @@ deserialize_fi_node (struct GNUNET_FS_Handle *h, const char *fn, filename = NULL; if ((GNUNET_OK != GNUNET_BIO_read_meta_data (rh, "metadata", &ret->meta)) || (GNUNET_OK != GNUNET_BIO_read_string (rh, "ksk-uri", &ksks, 32 * 1024)) || - ((ksks != NULL) && - (NULL == (ret->keywords = GNUNET_FS_uri_parse (ksks, NULL)))) || - (GNUNET_YES != GNUNET_FS_uri_test_ksk (ret->keywords)) || + ( (NULL != ksks) && + ( (NULL == (ret->keywords = GNUNET_FS_uri_parse (ksks, NULL))) || + (GNUNET_YES != GNUNET_FS_uri_test_ksk (ret->keywords)) ) ) || (GNUNET_OK != GNUNET_BIO_read_string (rh, "chk-uri", &chks, 1024)) || - ((chks != NULL) && - ((NULL == (ret->chk_uri = GNUNET_FS_uri_parse (chks, NULL))) || - (GNUNET_YES != GNUNET_FS_uri_test_chk (ret->chk_uri)))) || + ( (NULL != chks) && + ( (NULL == (ret->chk_uri = GNUNET_FS_uri_parse (chks, NULL))) || + (GNUNET_YES != GNUNET_FS_uri_test_chk (ret->chk_uri))) ) || (GNUNET_OK != read_start_time (rh, &ret->start_time)) || (GNUNET_OK != GNUNET_BIO_read_string (rh, "emsg", &ret->emsg, 16 * 1024)) || (GNUNET_OK != diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 134dd21e4..315e3a157 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c @@ -388,6 +388,7 @@ encode_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) p = pc->fi_pos; GNUNET_FS_tree_encoder_finish (p->te, &p->chk_uri, &emsg); p->te = NULL; + GNUNET_FS_file_information_sync_ (p); if (NULL != emsg) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error during tree walk: %s\n", emsg); -- 2.25.1