diff options
Diffstat (limited to 'src/fs/fs_publish.c')
-rw-r--r-- | src/fs/fs_publish.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 46b342cab..02ddb2a0d 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c | |||
@@ -842,7 +842,7 @@ do_upload (void *cls, | |||
842 | while (NULL != p->dir) | 842 | while (NULL != p->dir) |
843 | { | 843 | { |
844 | fn = GNUNET_CONTAINER_meta_data_get_by_type (p->meta, | 844 | fn = GNUNET_CONTAINER_meta_data_get_by_type (p->meta, |
845 | EXTRACTOR_FILENAME); | 845 | EXTRACTOR_METATYPE_FILENAME); |
846 | p = p->dir; | 846 | p = p->dir; |
847 | GNUNET_asprintf (&p->emsg, | 847 | GNUNET_asprintf (&p->emsg, |
848 | _("Recursive upload failed at `%s'"), | 848 | _("Recursive upload failed at `%s'"), |
@@ -1305,6 +1305,7 @@ GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h, | |||
1305 | char *uris; | 1305 | char *uris; |
1306 | size_t size; | 1306 | size_t size; |
1307 | char *kbe; | 1307 | char *kbe; |
1308 | char *sptr; | ||
1308 | 1309 | ||
1309 | pkc = GNUNET_malloc (sizeof (struct PublishKskContext)); | 1310 | pkc = GNUNET_malloc (sizeof (struct PublishKskContext)); |
1310 | pkc->h = h; | 1311 | pkc->h = h; |
@@ -1324,8 +1325,7 @@ GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h, | |||
1324 | return; | 1325 | return; |
1325 | } | 1326 | } |
1326 | } | 1327 | } |
1327 | pkc->mdsize = GNUNET_CONTAINER_meta_data_get_serialized_size (meta, | 1328 | pkc->mdsize = GNUNET_CONTAINER_meta_data_get_serialized_size (meta); |
1328 | GNUNET_CONTAINER_META_DATA_SERIALIZE_PART); | ||
1329 | GNUNET_assert (pkc->mdsize >= 0); | 1329 | GNUNET_assert (pkc->mdsize >= 0); |
1330 | uris = GNUNET_FS_uri_to_string (uri); | 1330 | uris = GNUNET_FS_uri_to_string (uri); |
1331 | pkc->slen = strlen (uris) + 1; | 1331 | pkc->slen = strlen (uris) + 1; |
@@ -1339,8 +1339,9 @@ GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h, | |||
1339 | kbe = (char *) &pkc->kb[1]; | 1339 | kbe = (char *) &pkc->kb[1]; |
1340 | memcpy (kbe, uris, pkc->slen); | 1340 | memcpy (kbe, uris, pkc->slen); |
1341 | GNUNET_free (uris); | 1341 | GNUNET_free (uris); |
1342 | sptr = &kbe[pkc->slen]; | ||
1342 | pkc->mdsize = GNUNET_CONTAINER_meta_data_serialize (meta, | 1343 | pkc->mdsize = GNUNET_CONTAINER_meta_data_serialize (meta, |
1343 | &kbe[pkc->slen], | 1344 | &sptr, |
1344 | pkc->mdsize, | 1345 | pkc->mdsize, |
1345 | GNUNET_CONTAINER_META_DATA_SERIALIZE_PART); | 1346 | GNUNET_CONTAINER_META_DATA_SERIALIZE_PART); |
1346 | if (pkc->mdsize == -1) | 1347 | if (pkc->mdsize == -1) |
@@ -1480,8 +1481,7 @@ GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h, | |||
1480 | if (update == NULL) | 1481 | if (update == NULL) |
1481 | update = ""; | 1482 | update = ""; |
1482 | nidlen = strlen (update) + 1; | 1483 | nidlen = strlen (update) + 1; |
1483 | mdsize = GNUNET_CONTAINER_meta_data_get_serialized_size (meta, | 1484 | mdsize = GNUNET_CONTAINER_meta_data_get_serialized_size (meta); |
1484 | GNUNET_CONTAINER_META_DATA_SERIALIZE_PART); | ||
1485 | 1485 | ||
1486 | size = sizeof (struct SBlock) + slen + nidlen + mdsize; | 1486 | size = sizeof (struct SBlock) + slen + nidlen + mdsize; |
1487 | if (size > MAX_SBLOCK_SIZE) | 1487 | if (size > MAX_SBLOCK_SIZE) |
@@ -1496,7 +1496,7 @@ GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h, | |||
1496 | memcpy (dest, uris, slen); | 1496 | memcpy (dest, uris, slen); |
1497 | dest += slen; | 1497 | dest += slen; |
1498 | mdsize = GNUNET_CONTAINER_meta_data_serialize (meta, | 1498 | mdsize = GNUNET_CONTAINER_meta_data_serialize (meta, |
1499 | dest, | 1499 | &dest, |
1500 | mdsize, | 1500 | mdsize, |
1501 | GNUNET_CONTAINER_META_DATA_SERIALIZE_PART); | 1501 | GNUNET_CONTAINER_META_DATA_SERIALIZE_PART); |
1502 | if (mdsize == -1) | 1502 | if (mdsize == -1) |