* @param msg error message (or NULL)
*/
static void
-ds_put_cont (void *cls, int success,
+ds_put_cont (void *cls, int success,
struct GNUNET_TIME_Absolute min_expiration,
const char *msg)
{
* @param msg error message (typically NULL, not used)
*/
static void
-finish_release_reserve (void *cls, int success,
+finish_release_reserve (void *cls, int success,
struct GNUNET_TIME_Absolute min_expiration,
const char *msg)
{
struct GNUNET_FS_PublishContext *pc = cls;
pc->qre = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Releasing reserve done!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Releasing reserve done!\n");
signal_publish_completion (pc->fi, pc);
pc->all_done = GNUNET_YES;
GNUNET_FS_publish_sync_ (pc);
{
if (NULL != pc->ns)
pc->sks_pc = GNUNET_FS_publish_sks (pc->h,
- pc->ns,
- pc->nid,
+ pc->ns,
+ pc->nid,
pc->nuid,
pc->fi->meta,
pc->fi->chk_uri,
pc->ksk_pc = NULL;
if (NULL != emsg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error uploading KSK blocks: %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Error uploading KSK blocks: %s\n",
emsg);
signal_publish_error (p, pc, emsg);
GNUNET_FS_file_information_sync_ (p);
}
else
{
- if (UINT64_MAX == offset)
+ if (UINT64_MAX == offset)
{
if (&GNUNET_FS_data_reader_file_ == p->data.file.reader)
{
char *emsg;
uint64_t flen;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished with tree encoder\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Finished with tree encoder\n");
p = pc->fi_pos;
+ p->chk_uri = GNUNET_FS_tree_encoder_get_uri (p->te);
GNUNET_FS_file_information_sync_ (p);
- GNUNET_FS_tree_encoder_finish (p->te, &p->chk_uri, &emsg);
+ GNUNET_FS_tree_encoder_finish (p->te, &emsg);
p->te = NULL;
if (NULL != emsg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error during tree walk: %s\n", emsg);
- GNUNET_asprintf (&p->emsg, _("Publishing failed: %s"), emsg);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Error during tree walk: %s\n",
+ emsg);
+ GNUNET_asprintf (&p->emsg,
+ _("Publishing failed: %s"),
+ emsg);
GNUNET_free (emsg);
pi.status = GNUNET_FS_STATUS_PUBLISH_ERROR;
pi.value.publish.eta = GNUNET_TIME_UNIT_FOREVER_REL;
/**
* Function called asking for the current (encoded)
* block to be processed. After processing the
- * client should either call "GNUNET_FS_tree_encode_next"
- * or (on error) "GNUNET_FS_tree_encode_finish".
+ * client should either call #GNUNET_FS_tree_encoder_next
+ * or (on error) #GNUNET_FS_tree_encoder_finish.
*
* @param cls closure
* @param chk content hash key for the block
return;
}
- if ((p->is_directory != GNUNET_YES) && (GNUNET_YES == p->data.file.do_index) &&
- (type == GNUNET_BLOCK_TYPE_FS_DBLOCK))
+ if ( (GNUNET_YES != p->is_directory) &&
+ (GNUNET_YES == p->data.file.do_index) &&
+ (GNUNET_BLOCK_TYPE_FS_DBLOCK == type) )
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Indexing block `%s' for offset %llu with index size %u\n",
uint64_t size;
p = pc->fi_pos;
- GNUNET_assert (p != NULL);
+ GNUNET_assert (NULL != p);
if (NULL == p->te)
{
- if (p->is_directory == GNUNET_YES)
+ if (GNUNET_YES == p->is_directory)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating directory\n");
db = GNUNET_FS_directory_builder_create (p->meta);
dirpos = p->data.dir.entries;
while (NULL != dirpos)
{
- if (dirpos->is_directory == GNUNET_YES)
+ if (GNUNET_YES == dirpos->is_directory)
{
raw_data = dirpos->data.dir.dir_data;
dirpos->data.dir.dir_data = NULL;
&p->data.dir.dir_data);
GNUNET_FS_file_information_sync_ (p);
}
- size = (p->is_directory == GNUNET_YES) ? p->data.dir.dir_size : p->data.file.file_size;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating tree encoder\n");
+ size = (GNUNET_YES == p->is_directory) ? p->data.dir.dir_size : p->data.file.file_size;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating tree encoder\n");
p->te =
GNUNET_FS_tree_encoder_create (pc->h, size, pc, &block_reader,
&block_proc, &progress_proc,
&encode_cont);
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Processing next block from tree\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing next block from tree\n");
GNUNET_FS_tree_encoder_next (p->te);
}
* @param msg the response we got
*/
static void
-process_index_start_response (void *cls,
+process_index_start_response (void *cls,
const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_FS_PublishContext *pc = cls;
GNUNET_CLIENT_disconnect (pc->client);
pc->client = NULL;
p = pc->fi_pos;
- if (msg == NULL)
+ if (NULL == msg)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Can not index file `%s': %s. Will try to insert instead.\n"),
+ _("Can not index file `%s': %s. Will try to insert instead.\n"),
p->filename,
_("timeout on index-start request to `fs' service"));
p->data.file.do_index = GNUNET_NO;
if (NULL == res)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Can not index file `%s': %s. Will try to insert instead.\n"),
- p->filename, _("failed to compute hash"));
+ _("Can not index file `%s': %s. Will try to insert instead.\n"),
+ p->filename,
+ _("failed to compute hash"));
p->data.file.do_index = GNUNET_NO;
GNUNET_FS_file_information_sync_ (p);
publish_content (pc);
if (NULL == client)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Can not index file `%s': %s. Will try to insert instead.\n"),
- p->filename, _("could not connect to `fs' service"));
+ _("Can not index file `%s': %s. Will try to insert instead.\n"),
+ p->filename,
+ _("could not connect to `fs' service"));
p->data.file.do_index = GNUNET_NO;
publish_content (pc);
GNUNET_free (fn);
return;
}
/* find starting position */
- while ( (GNUNET_YES == p->is_directory) &&
- (NULL != p->data.dir.entries) &&
+ while ( (GNUNET_YES == p->is_directory) &&
+ (NULL != p->data.dir.entries) &&
(NULL == p->emsg) &&
(NULL == p->data.dir.entries->chk_uri) )
{
/* abort on error */
if (NULL != p->emsg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Error uploading: %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Error uploading: %s\n",
p->emsg);
/* error with current file, abort all
* related files as well! */
p->bo.expiration_time);
GNUNET_FS_uri_destroy (p->chk_uri);
p->chk_uri = loc;
+ GNUNET_FS_file_information_sync_ (p);
}
GNUNET_FS_publish_sync_ (pc);
/* upload of "p" complete, publish KBlocks! */
- if (p->keywords != NULL)
+ if (NULL != p->keywords)
{
pc->ksk_pc = GNUNET_FS_publish_ksk (pc->h, p->keywords, p->meta, p->chk_uri, &p->bo,
pc->options, &publish_kblocks_cont, pc);
}
return;
}
- if ((p->is_directory != GNUNET_YES) && (p->data.file.do_index))
+ if ((GNUNET_YES != p->is_directory) && (p->data.file.do_index))
{
if (NULL == p->filename)
{
struct GNUNET_FS_FileInformation *fi,
uint64_t length,
struct GNUNET_CONTAINER_MetaData *meta,
- struct GNUNET_FS_Uri **uri,
+ struct GNUNET_FS_Uri **uri,
struct GNUNET_FS_BlockOptions *bo,
- int *do_index,
+ int *do_index,
void **client_info)
{
struct GNUNET_FS_PublishContext *pc = cls;
pc->skip_next_fi_callback = GNUNET_NO;
return GNUNET_OK;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting publish operation\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting publish operation\n");
if (*do_index)
{
/* space for on-demand blocks */
GNUNET_FS_publish_sks_cancel (pc->sks_pc);
pc->sks_pc = NULL;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Suspending publish operation\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Suspending publish operation\n");
GNUNET_free_non_null (fi->serialization);
fi->serialization = NULL;
- off = (fi->chk_uri == NULL) ? 0 : (fi->is_directory == GNUNET_YES) ? fi->data.dir.dir_size : fi->data.file.file_size;
+ off = (NULL == fi->chk_uri) ? 0 : (GNUNET_YES == fi->is_directory) ? fi->data.dir.dir_size : fi->data.file.file_size;
pi.status = GNUNET_FS_STATUS_PUBLISH_SUSPEND;
GNUNET_break (NULL == GNUNET_FS_publish_make_status_ (&pi, pc, fi, off));
if (NULL != pc->qre)
* Signal the FS's progress function that we are suspending
* an upload. Performs the recursion.
*
- * @param cls closure (of type "struct GNUNET_FS_PublishContext*")
+ * @param cls closure (of type `struct GNUNET_FS_PublishContext *`)
* @param fi the entry in the publish-structure
* @param length length of the file or directory
* @param meta metadata for the file or directory (can be modified)
static int
fip_signal_suspend (void *cls,
struct GNUNET_FS_FileInformation *fi,
- uint64_t length,
+ uint64_t length,
struct GNUNET_CONTAINER_MetaData *meta,
struct GNUNET_FS_Uri **uri,
- struct GNUNET_FS_BlockOptions *bo,
+ struct GNUNET_FS_BlockOptions *bo,
int *do_index,
void **client_info)
{
* Create SUSPEND event for the given publish operation
* and then clean up our state (without stop signal).
*
- * @param cls the 'struct GNUNET_FS_PublishContext' to signal for
+ * @param cls the `struct GNUNET_FS_PublishContext` to signal for
*/
void
GNUNET_FS_publish_signal_suspend_ (void *cls)
* @param msg error message on error, otherwise NULL
*/
static void
-finish_reserve (void *cls, int success,
+finish_reserve (void *cls, int success,
struct GNUNET_TIME_Absolute min_expiration,
const char *msg)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reservation complete (%d)!\n", success);
if ((msg != NULL) || (success <= 0))
{
- GNUNET_asprintf (&pc->fi->emsg,
+ GNUNET_asprintf (&pc->fi->emsg,
_("Insufficient space for publishing: %s"),
msg);
signal_publish_error (pc->fi, pc, pc->fi->emsg);