qe->h->active_blocks += qe->blocks;
qe->start_time = GNUNET_TIME_absolute_get ();
GNUNET_CONTAINER_DLL_remove (qe->h->pending_head, qe->h->pending_tail, qe);
- GNUNET_CONTAINER_DLL_insert_after (qe->h->running_head,
- qe->h->running_tail,
+ GNUNET_CONTAINER_DLL_insert_after (qe->h->running_head, qe->h->running_tail,
qe->h->running_tail, qe);
}
qe->stop (qe->cls);
qe->h->active_downloads--;
qe->h->active_blocks -= qe->blocks;
- qe->run_time = GNUNET_TIME_relative_add (qe->run_time,
- GNUNET_TIME_absolute_get_duration
- (qe->start_time));
+ qe->run_time =
+ GNUNET_TIME_relative_add (qe->run_time,
+ GNUNET_TIME_absolute_get_duration
+ (qe->start_time));
GNUNET_CONTAINER_DLL_remove (qe->h->running_head, qe->h->running_tail, qe);
- GNUNET_CONTAINER_DLL_insert_after (qe->h->pending_head,
- qe->h->pending_tail,
+ GNUNET_CONTAINER_DLL_insert_after (qe->h->pending_head, qe->h->pending_tail,
qe->h->pending_tail, qe);
}
while (NULL != (qe = next))
{
next = qe->next;
- run_time = GNUNET_TIME_relative_multiply (h->avg_block_latency,
- qe->blocks * qe->start_times);
+ run_time =
+ GNUNET_TIME_relative_multiply (h->avg_block_latency,
+ qe->blocks * qe->start_times);
end_time = GNUNET_TIME_absolute_add (qe->start_time, run_time);
rst = GNUNET_TIME_absolute_get_remaining (end_time);
restart_at = GNUNET_TIME_relative_min (rst, restart_at);
continue;
stop_job (qe);
}
- h->queue_job = GNUNET_SCHEDULER_add_delayed (restart_at,
- &process_job_queue, h);
+ h->queue_job =
+ GNUNET_SCHEDULER_add_delayed (restart_at, &process_job_queue, h);
}
* @return queue handle
*/
struct GNUNET_FS_QueueEntry *
-GNUNET_FS_queue_ (struct GNUNET_FS_Handle *h,
- GNUNET_FS_QueueStart start,
+GNUNET_FS_queue_ (struct GNUNET_FS_Handle *h, GNUNET_FS_QueueStart start,
GNUNET_FS_QueueStop stop, void *cls, unsigned int blocks)
{
struct GNUNET_FS_QueueEntry *qe;
qe->cls = cls;
qe->queue_time = GNUNET_TIME_absolute_get ();
qe->blocks = blocks;
- GNUNET_CONTAINER_DLL_insert_after (h->pending_head,
- h->pending_tail, h->pending_tail, qe);
+ GNUNET_CONTAINER_DLL_insert_after (h->pending_head, h->pending_tail,
+ h->pending_tail, qe);
if (h->queue_job != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (h->queue_job);
h->queue_job = GNUNET_SCHEDULER_add_now (&process_job_queue, h);
* @return fresh top-level activity handle
*/
struct TopLevelActivity *
-GNUNET_FS_make_top (struct GNUNET_FS_Handle *h,
- SuspendSignalFunction ssf, void *ssf_cls)
+GNUNET_FS_make_top (struct GNUNET_FS_Handle *h, SuspendSignalFunction ssf,
+ void *ssf_cls)
{
struct TopLevelActivity *ret;
/**
* Destroy a top-level activity entry.
- *
+ *
* @param h global fs handle
* @param top top level activity entry
*/
* @param offset offset to read from; it is possible
* that the caller might need to go backwards
* a bit at times
- * @param max maximum number of bytes that should be
+ * @param max maximum number of bytes that should be
* copied to buf; readers are not allowed
* to provide less data unless there is an error;
* a value of "0" will be used at the end to allow
* @return number of bytes written, usually "max", 0 on error
*/
size_t
-GNUNET_FS_data_reader_file_ (void *cls,
- uint64_t offset,
- size_t max, void *buf, char **emsg)
+GNUNET_FS_data_reader_file_ (void *cls, uint64_t offset, size_t max, void *buf,
+ char **emsg)
{
struct FileInfo *fi = cls;
ssize_t ret;
}
if (fi->fd == NULL)
{
- fi->fd = GNUNET_DISK_file_open (fi->filename,
- GNUNET_DISK_OPEN_READ,
- GNUNET_DISK_PERM_NONE);
+ fi->fd =
+ GNUNET_DISK_file_open (fi->filename, GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE);
if (fi->fd == NULL)
{
- GNUNET_asprintf (emsg,
- _("Could not open file `%s': %s"),
- fi->filename, STRERROR (errno));
+ GNUNET_asprintf (emsg, _("Could not open file `%s': %s"), fi->filename,
+ STRERROR (errno));
return 0;
}
}
ret = GNUNET_DISK_file_read (fi->fd, buf, max);
if (ret == -1)
{
- GNUNET_asprintf (emsg,
- _("Could not read file `%s': %s"),
- fi->filename, STRERROR (errno));
+ GNUNET_asprintf (emsg, _("Could not read file `%s': %s"), fi->filename,
+ STRERROR (errno));
return 0;
}
if (ret != max)
{
- GNUNET_asprintf (emsg,
- _("Short read reading from file `%s'!"), fi->filename);
+ GNUNET_asprintf (emsg, _("Short read reading from file `%s'!"),
+ fi->filename);
return 0;
}
return max;
* @param offset offset to read from; it is possible
* that the caller might need to go backwards
* a bit at times
- * @param max maximum number of bytes that should be
+ * @param max maximum number of bytes that should be
* copied to buf; readers are not allowed
* to provide less data unless there is an error;
* a value of "0" will be used at the end to allow
* @return number of bytes written, usually "max", 0 on error
*/
size_t
-GNUNET_FS_data_reader_copy_ (void *cls,
- uint64_t offset,
- size_t max, void *buf, char **emsg)
+GNUNET_FS_data_reader_copy_ (void *cls, uint64_t offset, size_t max, void *buf,
+ char **emsg)
{
char *data = cls;
* (for serialization/deserialization).
*
* @param h master context
- * @param ext component of the path
+ * @param ext component of the path
* @param ent entity identifier (or emtpy string for the directory)
* @return NULL on error
*/
static char *
-get_serialization_file_name (struct GNUNET_FS_Handle *h,
- const char *ext, const char *ent)
+get_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext,
+ const char *ent)
{
char *basename;
char *ret;
if (0 == (h->flags & GNUNET_FS_FLAGS_PERSISTENCE))
return NULL; /* persistence not requested */
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (h->cfg,
- "fs", "STATE_DIR", &basename))
+ GNUNET_CONFIGURATION_get_value_filename (h->cfg, "fs", "STATE_DIR",
+ &basename))
return NULL;
- GNUNET_asprintf (&ret,
- "%s%s%s%s%s%s%s",
- basename,
- DIR_SEPARATOR_STR,
- h->client_name,
- DIR_SEPARATOR_STR, ext, DIR_SEPARATOR_STR, ent);
+ GNUNET_asprintf (&ret, "%s%s%s%s%s%s%s", basename, DIR_SEPARATOR_STR,
+ h->client_name, DIR_SEPARATOR_STR, ext, DIR_SEPARATOR_STR,
+ ent);
GNUNET_free (basename);
return ret;
}
* parent operation.
*
* @param h master context
- * @param ext component of the path
+ * @param ext component of the path
* @param uni name of the parent operation
* @param ent entity identifier (or emtpy string for the directory)
* @return NULL on error
*/
static char *
-get_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h,
- const char *ext,
+get_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h, const char *ext,
const char *uni, const char *ent)
{
char *basename;
if (0 == (h->flags & GNUNET_FS_FLAGS_PERSISTENCE))
return NULL; /* persistence not requested */
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (h->cfg,
- "fs", "STATE_DIR", &basename))
+ GNUNET_CONFIGURATION_get_value_filename (h->cfg, "fs", "STATE_DIR",
+ &basename))
return NULL;
- GNUNET_asprintf (&ret,
- "%s%s%s%s%s%s%s.dir%s%s",
- basename,
- DIR_SEPARATOR_STR,
- h->client_name,
- DIR_SEPARATOR_STR,
- ext, DIR_SEPARATOR_STR, uni, DIR_SEPARATOR_STR, ent);
+ GNUNET_asprintf (&ret, "%s%s%s%s%s%s%s.dir%s%s", basename, DIR_SEPARATOR_STR,
+ h->client_name, DIR_SEPARATOR_STR, ext, DIR_SEPARATOR_STR,
+ uni, DIR_SEPARATOR_STR, ent);
GNUNET_free (basename);
return ret;
}
* Return a read handle for deserialization.
*
* @param h master context
- * @param ext component of the path
+ * @param ext component of the path
* @param ent entity identifier (or emtpy string for the directory)
* @return NULL on error
*/
* Return a write handle for serialization.
*
* @param h master context
- * @param ext component of the path
+ * @param ext component of the path
* @param ent entity identifier (or emtpy string for the directory)
* @return NULL on error
*/
* Return a write handle for serialization.
*
* @param h master context
- * @param ext component of the path
+ * @param ext component of the path
* @param uni name of parent
* @param ent entity identifier (or emtpy string for the directory)
* @return NULL on error
*/
static struct GNUNET_BIO_WriteHandle *
-get_write_handle_in_dir (struct GNUNET_FS_Handle *h,
- const char *ext, const char *uni, const char *ent)
+get_write_handle_in_dir (struct GNUNET_FS_Handle *h, const char *ext,
+ const char *uni, const char *ent)
{
char *fn;
struct GNUNET_BIO_WriteHandle *ret;
* Remove serialization/deserialization file from disk.
*
* @param h master context
- * @param ext component of the path
- * @param ent entity identifier
+ * @param ext component of the path
+ * @param ent entity identifier
*/
void
-GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h,
- const char *ext, const char *ent)
+GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, const char *ext,
+ const char *ent)
{
char *filename;
* Remove serialization/deserialization file from disk.
*
* @param h master context
- * @param ext component of the path
+ * @param ext component of the path
* @param uni parent name
- * @param ent entity identifier
+ * @param ent entity identifier
*/
static void
-remove_sync_file_in_dir (struct GNUNET_FS_Handle *h,
- const char *ext, const char *uni, const char *ent)
+remove_sync_file_in_dir (struct GNUNET_FS_Handle *h, const char *ext,
+ const char *uni, const char *ent)
{
char *filename;
* Remove serialization/deserialization directory from disk.
*
* @param h master context
- * @param ext component of the path
- * @param uni unique name of parent
+ * @param ext component of the path
+ * @param uni unique name of parent
*/
void
-GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h,
- const char *ext, const char *uni)
+GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, const char *ext,
+ const char *uni)
{
char *dn;
* the infromation
* @return NULL on error
*/
-static struct GNUNET_FS_FileInformation *deserialize_file_information (struct
- GNUNET_FS_Handle
- *h,
- const
- char
- *filename);
+static struct GNUNET_FS_FileInformation *
+deserialize_file_information (struct GNUNET_FS_Handle *h, const char *filename);
/**
* @return NULL on error
*/
static struct GNUNET_FS_FileInformation *
-deserialize_fi_node (struct GNUNET_FS_Handle *h,
- const char *fn, struct GNUNET_BIO_ReadHandle *rh)
+deserialize_fi_node (struct GNUNET_FS_Handle *h, const char *fn,
+ struct GNUNET_BIO_ReadHandle *rh)
{
struct GNUNET_FS_FileInformation *ret;
struct GNUNET_FS_FileInformation *nxt;
ksks = NULL;
chks = NULL;
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)) ||
+ 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)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_string (rh, "chk-uri", &chks, 1024)) ||
+ (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)))) ||
- (GNUNET_OK !=
- read_start_time (rh, &ret->start_time)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_string (rh, "emsg", &ret->emsg, 16 * 1024)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_string (rh, "fn", &ret->filename, 16 * 1024)) ||
+ ((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 !=
+ GNUNET_BIO_read_string (rh, "fn", &ret->filename, 16 * 1024)) ||
(GNUNET_OK !=
GNUNET_BIO_read_int64 (rh, &ret->bo.expiration_time.abs_value)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_int32 (rh, &ret->bo.anonymity_level)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_int32 (rh, &ret->bo.content_priority)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &ret->bo.anonymity_level)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &ret->bo.content_priority)) ||
(GNUNET_OK != GNUNET_BIO_read_int32 (rh, &ret->bo.replication_level)))
{
GNUNET_break (0);
GNUNET_break (0);
goto cleanup;
}
- if ((GNUNET_OK !=
- GNUNET_BIO_read_int64 (rh, &ret->data.file.file_size)) ||
+ if ((GNUNET_OK != GNUNET_BIO_read_int64 (rh, &ret->data.file.file_size)) ||
(GNUNET_OK !=
GNUNET_BIO_read (rh, "fileid", &ret->data.file.file_id,
sizeof (GNUNET_HashCode))))
GNUNET_break (0);
goto cleanup;
}
- if ((GNUNET_OK !=
- GNUNET_BIO_read_int64 (rh, &ret->data.file.file_size)) ||
+ if ((GNUNET_OK != GNUNET_BIO_read_int64 (rh, &ret->data.file.file_size)) ||
(GNUNET_OK !=
GNUNET_BIO_read (rh, "fileid", &ret->data.file.file_id,
sizeof (GNUNET_HashCode))))
break;
case 4: /* directory */
ret->is_directory = GNUNET_YES;
- if ((GNUNET_OK !=
- GNUNET_BIO_read_int32 (rh, &dsize)) ||
+ if ((GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dsize)) ||
(NULL == (ret->data.dir.dir_data = GNUNET_malloc_large (dsize))) ||
(GNUNET_OK !=
GNUNET_BIO_read (rh, "dir-data", ret->data.dir.dir_data, dsize)) ||
* Given a serialization name (full absolute path), return the
* basename of the file (without the path), which must only
* consist of the 6 random characters.
- *
+ *
* @param fullname name to extract the basename from
* @return copy of the basename, NULL on error
*/
* is enabled and returns NULL if not.
*
* @param h master context
- * @param ext component of the path
+ * @param ext component of the path
* @return NULL on errror
*/
static char *
* is enabled and returns NULL if not.
*
* @param h master context
- * @param ext component of the path
+ * @param ext component of the path
* @param uni name of parent
* @return NULL on errror
*/
while (off < fi->data.file.file_size)
{
left = GNUNET_MIN (sizeof (buf), fi->data.file.file_size - off);
- ret = fi->data.file.reader (fi->data.file.reader_cls,
- off, left, buf, &emsg);
+ ret =
+ fi->data.file.reader (fi->data.file.reader_cls, off, left, buf, &emsg);
if (ret == 0)
{
GNUNET_free (emsg);
chks = GNUNET_FS_uri_to_string (fi->chk_uri);
else
chks = NULL;
- if ((GNUNET_OK !=
- GNUNET_BIO_write (wh, &b, sizeof (b))) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_meta_data (wh, fi->meta)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_string (wh, ksks)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_string (wh, chks)) ||
- (GNUNET_OK !=
- write_start_time (wh, fi->start_time)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_string (wh, fi->emsg)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_string (wh, fi->filename)) ||
+ if ((GNUNET_OK != GNUNET_BIO_write (wh, &b, sizeof (b))) ||
+ (GNUNET_OK != GNUNET_BIO_write_meta_data (wh, fi->meta)) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, ksks)) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, chks)) ||
+ (GNUNET_OK != write_start_time (wh, fi->start_time)) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, fi->emsg)) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, fi->filename)) ||
(GNUNET_OK !=
GNUNET_BIO_write_int64 (wh, fi->bo.expiration_time.abs_value)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int32 (wh, fi->bo.anonymity_level)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int32 (wh, fi->bo.content_priority)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->bo.anonymity_level)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->bo.content_priority)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->bo.replication_level)))
{
GNUNET_break (0);
GNUNET_break (0);
goto cleanup;
}
- if ((GNUNET_OK !=
- GNUNET_BIO_write_int64 (wh, fi->data.file.file_size)) ||
+ if ((GNUNET_OK != GNUNET_BIO_write_int64 (wh, fi->data.file.file_size)) ||
(GNUNET_OK !=
GNUNET_BIO_write (wh, &fi->data.file.file_id,
sizeof (GNUNET_HashCode))))
}
break;
case 4: /* directory */
- if ((GNUNET_OK !=
- GNUNET_BIO_write_int32 (wh, fi->data.dir.dir_size)) ||
+ if ((GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->data.dir.dir_size)) ||
(GNUNET_OK !=
GNUNET_BIO_write (wh, fi->data.dir.dir_data,
(uint32_t) fi->data.dir.dir_size)) ||
* @return GNUNET_OK to continue (always)
*/
static int
-fip_signal_resume (void *cls,
- struct GNUNET_FS_FileInformation *fi,
- uint64_t length,
- struct GNUNET_CONTAINER_MetaData *meta,
+fip_signal_resume (void *cls, struct GNUNET_FS_FileInformation *fi,
+ uint64_t length, struct GNUNET_CONTAINER_MetaData *meta,
struct GNUNET_FS_Uri **uri,
- struct GNUNET_FS_BlockOptions *bo,
- int *do_index, void **client_info)
+ struct GNUNET_FS_BlockOptions *bo, int *do_index,
+ void **client_info)
{
struct GNUNET_FS_PublishContext *sc = cls;
struct GNUNET_FS_ProgressInfo pi;
GNUNET_break (0);
goto cleanup;
}
- if ((GNUNET_OK !=
- GNUNET_BIO_read_string (rh, "publish-nid", &pc->nid, 1024)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_string (rh, "publish-nuid", &pc->nuid, 1024)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_int32 (rh, &options)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_int32 (rh, &all_done)) ||
+ if ((GNUNET_OK != GNUNET_BIO_read_string (rh, "publish-nid", &pc->nid, 1024))
+ || (GNUNET_OK !=
+ GNUNET_BIO_read_string (rh, "publish-nuid", &pc->nuid, 1024)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &options)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &all_done)) ||
(GNUNET_OK !=
GNUNET_BIO_read_string (rh, "publish-firoot", &fi_root, 128)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_string (rh, "publish-fipos", &fi_pos, 128)) ||
- (GNUNET_OK != GNUNET_BIO_read_string (rh, "publish-ns", &ns, 1024)))
+ (GNUNET_OK != GNUNET_BIO_read_string (rh, "publish-fipos", &fi_pos, 128))
+ || (GNUNET_OK != GNUNET_BIO_read_string (rh, "publish-ns", &ns, 1024)))
{
GNUNET_break (0);
goto cleanup;
if (pc->all_done != GNUNET_YES)
{
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task);
- pc->upload_task
- =
+ pc->upload_task =
GNUNET_SCHEDULER_add_with_priority
(GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, pc);
}
if ((rh != NULL) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to resume publishing operation `%s': %s\n"),
- filename, emsg);
+ _("Failed to resume publishing operation `%s': %s\n"), filename,
+ emsg);
GNUNET_free (emsg);
}
if (pc->fi != NULL)
* on disk. Note that all internal FS-operations that change
* publishing structs should already call "sync" internally,
* so this function is likely not useful for clients.
- *
+ *
* @param pc the struct to sync
*/
void
struct GNUNET_BIO_WriteHandle *wh;
if (NULL == pc->serialization)
- pc->serialization = make_serialization_file_name (pc->h,
- GNUNET_FS_SYNC_PATH_MASTER_PUBLISH);
+ pc->serialization =
+ make_serialization_file_name (pc->h,
+ GNUNET_FS_SYNC_PATH_MASTER_PUBLISH);
if (NULL == pc->serialization)
return;
if (NULL == pc->fi)
GNUNET_break (0);
goto cleanup;
}
- if ((GNUNET_OK !=
- GNUNET_BIO_write_string (wh, pc->nid)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_string (wh, pc->nuid)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int32 (wh, pc->options)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int32 (wh, pc->all_done)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_string (wh, pc->fi->serialization)) ||
+ if ((GNUNET_OK != GNUNET_BIO_write_string (wh, pc->nid)) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, pc->nuid)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int32 (wh, pc->options)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int32 (wh, pc->all_done)) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, pc->fi->serialization)) ||
(GNUNET_OK !=
GNUNET_BIO_write_string (wh,
(pc->fi_pos ==
* on disk. Note that all internal FS-operations that change
* publishing structs should already call "sync" internally,
* so this function is likely not useful for clients.
- *
+ *
* @param uc the struct to sync
*/
void
struct GNUNET_BIO_WriteHandle *wh;
if (NULL == uc->serialization)
- uc->serialization = make_serialization_file_name (uc->h,
- GNUNET_FS_SYNC_PATH_MASTER_UNINDEX);
+ uc->serialization =
+ make_serialization_file_name (uc->h,
+ GNUNET_FS_SYNC_PATH_MASTER_UNINDEX);
if (NULL == uc->serialization)
return;
wh = get_write_handle (uc->h, GNUNET_FS_SYNC_PATH_MASTER_UNINDEX,
GNUNET_break (0);
goto cleanup;
}
- if ((GNUNET_OK !=
- GNUNET_BIO_write_string (wh, uc->filename)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int64 (wh, uc->file_size)) ||
- (GNUNET_OK !=
- write_start_time (wh, uc->start_time)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int32 (wh, (uint32_t) uc->state)) ||
+ if ((GNUNET_OK != GNUNET_BIO_write_string (wh, uc->filename)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int64 (wh, uc->file_size)) ||
+ (GNUNET_OK != write_start_time (wh, uc->start_time)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int32 (wh, (uint32_t) uc->state)) ||
((uc->state == UNINDEX_STATE_FS_NOTIFY) &&
(GNUNET_OK !=
GNUNET_BIO_write (wh, &uc->file_id, sizeof (GNUNET_HashCode)))) ||
/**
* Serialize a download request.
- *
+ *
* @param wh the 'struct GNUNET_BIO_WriteHandle*'
* @param dr the 'struct DownloadRequest'
* @return GNUNET_YES on success, GNUNET_NO on error
{
unsigned int i;
- if ((GNUNET_OK !=
- GNUNET_BIO_write_int32 (wh, dr->state)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int64 (wh, dr->offset)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int32 (wh, dr->num_children)) ||
+ if ((GNUNET_OK != GNUNET_BIO_write_int32 (wh, dr->state)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int64 (wh, dr->offset)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int32 (wh, dr->num_children)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, dr->depth)))
return GNUNET_NO;
if ((dr->state == BRS_CHK_SET) &&
/**
* Read a download request tree.
- *
+ *
* @param rh stream to read from
* @return value the 'struct DownloadRequest', NULL on error
*/
dr = GNUNET_malloc (sizeof (struct DownloadRequest));
- if ((GNUNET_OK !=
- GNUNET_BIO_read_int32 (rh, &dr->state)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_int64 (rh, &dr->offset)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_int32 (rh, &dr->num_children)) ||
+ if ((GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->state)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &dr->offset)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->num_children)) ||
(dr->num_children > CHK_PER_INODE) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_int32 (rh, &dr->depth)) ||
- ((dr->depth == 0) && (dr->num_children > 0)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->depth)) || ((dr->depth == 0)
+ &&
+ (dr->num_children
+ > 0)) ||
((dr->depth > 0) && (dr->num_children == 0)))
{
GNUNET_break (0);
goto cleanup;
}
if (dr->num_children > 0)
- dr->children = GNUNET_malloc (dr->num_children *
- sizeof (struct ContentHashKey));
+ dr->children =
+ GNUNET_malloc (dr->num_children * sizeof (struct ContentHashKey));
switch (dr->state)
{
case BRS_INIT:
if (dc->parent == NULL)
return get_serialization_file_name (dc->h,
- (dc->search != NULL) ?
+ (dc->search !=
+ NULL) ?
GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD :
GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD,
uni);
* on disk. Note that all internal FS-operations that change
* publishing structs should already call "sync" internally,
* so this function is likely not useful for clients.
- *
+ *
* @param dc the struct to sync
*/
void
GNUNET_assert ((GNUNET_YES == GNUNET_FS_uri_test_chk (dc->uri)) ||
(GNUNET_YES == GNUNET_FS_uri_test_loc (dc->uri)));
uris = GNUNET_FS_uri_to_string (dc->uri);
- if ((GNUNET_OK !=
- GNUNET_BIO_write_string (wh, uris)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_meta_data (wh, dc->meta)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_string (wh, dc->emsg)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_string (wh, dc->filename)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_string (wh, dc->temp_filename)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int64 (wh, dc->old_file_size)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int64 (wh, dc->offset)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int64 (wh, dc->length)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int64 (wh, dc->completed)) ||
- (GNUNET_OK !=
- write_start_time (wh, dc->start_time)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int32 (wh, dc->anonymity)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int32 (wh, (uint32_t) dc->options)) ||
+ if ((GNUNET_OK != GNUNET_BIO_write_string (wh, uris)) ||
+ (GNUNET_OK != GNUNET_BIO_write_meta_data (wh, dc->meta)) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, dc->emsg)) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, dc->filename)) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, dc->temp_filename)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int64 (wh, dc->old_file_size)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int64 (wh, dc->offset)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int64 (wh, dc->length)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int64 (wh, dc->completed)) ||
+ (GNUNET_OK != write_start_time (wh, dc->start_time)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int32 (wh, dc->anonymity)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int32 (wh, (uint32_t) dc->options)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, (uint32_t) dc->has_finished)))
{
GNUNET_break (0);
* on disk. Note that all internal FS-operations that change
* publishing structs should already call "sync" internally,
* so this function is likely not useful for clients.
- *
+ *
* @param sr the struct to sync
*/
void
uris = NULL;
if (NULL == sr->serialization)
- sr->serialization = make_serialization_file_name_in_dir (sr->sc->h,
- (sr->
- sc->psearch_result
- ==
- NULL) ?
- GNUNET_FS_SYNC_PATH_MASTER_SEARCH
- :
- GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
- sr->
- sc->serialization);
+ sr->serialization =
+ make_serialization_file_name_in_dir (sr->sc->h,
+ (sr->sc->psearch_result ==
+ NULL) ?
+ GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
+ GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
+ sr->sc->serialization);
if (NULL == sr->serialization)
return;
wh = get_write_handle_in_dir (sr->sc->h,
- (sr->sc->psearch_result == NULL)
- ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
- : GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
+ (sr->sc->psearch_result ==
+ NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
+ GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
sr->sc->serialization, sr->serialization);
if (wh == NULL)
{
goto cleanup;
}
uris = GNUNET_FS_uri_to_string (sr->uri);
- if ((GNUNET_OK !=
- GNUNET_BIO_write_string (wh, uris)) ||
+ if ((GNUNET_OK != GNUNET_BIO_write_string (wh, uris)) ||
(GNUNET_OK !=
GNUNET_BIO_write_string (wh,
sr->download !=
if (wh != NULL)
(void) GNUNET_BIO_write_close (wh);
remove_sync_file_in_dir (sr->sc->h,
- (sr->sc->psearch_result == NULL)
- ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
- : GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
+ (sr->sc->psearch_result ==
+ NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
+ GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
sr->sc->serialization, sr->serialization);
GNUNET_free (sr->serialization);
sr->serialization = NULL;
* on disk. Note that all internal FS-operations that change
* publishing structs should already call "sync" internally,
* so this function is likely not useful for clients.
- *
+ *
* @param sc the struct to sync
*/
void
char in_pause;
const char *category;
- category = (sc->psearch_result == NULL)
- ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH : GNUNET_FS_SYNC_PATH_CHILD_SEARCH;
+ category =
+ (sc->psearch_result ==
+ NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
+ GNUNET_FS_SYNC_PATH_CHILD_SEARCH;
if (NULL == sc->serialization)
sc->serialization = make_serialization_file_name (sc->h, category);
if (NULL == sc->serialization)
(GNUNET_YES == GNUNET_FS_uri_test_sks (sc->uri)));
uris = GNUNET_FS_uri_to_string (sc->uri);
in_pause = (sc->task != GNUNET_SCHEDULER_NO_TASK) ? 'r' : '\0';
- if ((GNUNET_OK !=
- GNUNET_BIO_write_string (wh, uris)) ||
- (GNUNET_OK !=
- write_start_time (wh, sc->start_time)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_string (wh, sc->emsg)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_int32 (wh, (uint32_t) sc->options)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write (wh, &in_pause, sizeof (in_pause))) ||
+ if ((GNUNET_OK != GNUNET_BIO_write_string (wh, uris)) ||
+ (GNUNET_OK != write_start_time (wh, sc->start_time)) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, sc->emsg)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int32 (wh, (uint32_t) sc->options)) ||
+ (GNUNET_OK != GNUNET_BIO_write (wh, &in_pause, sizeof (in_pause))) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, sc->anonymity)))
{
GNUNET_break (0);
}
if ((GNUNET_OK !=
GNUNET_BIO_read_string (rh, "unindex-fn", &uc->filename, 10 * 1024)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_int64 (rh, &uc->file_size)) ||
- (GNUNET_OK !=
- read_start_time (rh, &uc->start_time)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &uc->file_size)) ||
+ (GNUNET_OK != read_start_time (rh, &uc->start_time)) ||
(GNUNET_OK != GNUNET_BIO_read_int32 (rh, &state)))
{
GNUNET_break (0);
uc->top = GNUNET_FS_make_top (h, &GNUNET_FS_unindex_signal_suspend_, uc);
pi.status = GNUNET_FS_STATUS_UNINDEX_RESUME;
pi.value.unindex.specifics.resume.message = uc->emsg;
- GNUNET_FS_unindex_make_status_ (&pi,
- uc,
- (uc->state == UNINDEX_STATE_COMPLETE)
- ? uc->file_size : 0);
+ GNUNET_FS_unindex_make_status_ (&pi, uc,
+ (uc->state ==
+ UNINDEX_STATE_COMPLETE) ? uc->file_size : 0);
switch (uc->state)
{
case UNINDEX_STATE_HASHING:
- uc->fhc = GNUNET_CRYPTO_hash_file (GNUNET_SCHEDULER_PRIORITY_IDLE,
- uc->filename,
- HASHING_BLOCKSIZE,
- &GNUNET_FS_unindex_process_hash_, uc);
+ uc->fhc =
+ GNUNET_CRYPTO_hash_file (GNUNET_SCHEDULER_PRIORITY_IDLE, uc->filename,
+ HASHING_BLOCKSIZE,
+ &GNUNET_FS_unindex_process_hash_, uc);
break;
case UNINDEX_STATE_FS_NOTIFY:
uc->state = UNINDEX_STATE_HASHING;
if ((rh != NULL) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to resume unindexing operation `%s': %s\n"),
- filename, emsg);
+ _("Failed to resume unindexing operation `%s': %s\n"), filename,
+ emsg);
GNUNET_free (emsg);
}
if (uc->serialization != NULL)
/**
- * Deserialize a search.
+ * Deserialize a search.
*
* @param h overall context
* @param rh file to deserialize from
* @param psearch_result parent search result
* @param serialization name under which the search was serialized
*/
-static struct GNUNET_FS_SearchContext *deserialize_search (struct
- GNUNET_FS_Handle *h,
- struct
- GNUNET_BIO_ReadHandle
- *rh,
- struct
- GNUNET_FS_SearchResult
- *psearch_result,
- const char
- *serialization);
+static struct GNUNET_FS_SearchContext *
+deserialize_search (struct GNUNET_FS_Handle *h,
+ struct GNUNET_BIO_ReadHandle *rh,
+ struct GNUNET_FS_SearchResult *psearch_result,
+ const char *serialization);
/**
if (ser != NULL)
{
remove_sync_file_in_dir (sc->h,
- (sc->psearch_result == NULL)
- ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
- : GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
+ (sc->psearch_result ==
+ NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
+ GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
sc->serialization, ser);
GNUNET_free (ser);
}
update_srch = NULL;
sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult));
sr->serialization = ser;
- if ((GNUNET_OK !=
- GNUNET_BIO_read_string (rh, "result-uri", &uris, 10 * 1024)) ||
- (NULL == (sr->uri = GNUNET_FS_uri_parse (uris, &emsg))) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_string (rh, "download-lnk", &download, 16)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_string (rh, "search-lnk", &update_srch, 16)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_meta_data (rh, "result-meta", &sr->meta)) ||
+ if ((GNUNET_OK != GNUNET_BIO_read_string (rh, "result-uri", &uris, 10 * 1024))
+ || (NULL == (sr->uri = GNUNET_FS_uri_parse (uris, &emsg))) ||
+ (GNUNET_OK != GNUNET_BIO_read_string (rh, "download-lnk", &download, 16))
+ || (GNUNET_OK !=
+ GNUNET_BIO_read_string (rh, "search-lnk", &update_srch, 16)) ||
+ (GNUNET_OK != GNUNET_BIO_read_meta_data (rh, "result-meta", &sr->meta)) ||
(GNUNET_OK !=
GNUNET_BIO_read (rh, "result-key", &sr->key, sizeof (GNUNET_HashCode)))
|| (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &sr->mandatory_missing)) ||
if (GNUNET_OK != GNUNET_BIO_read_close (drh, &emsg))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to resume sub-download `%s': %s\n"),
- download, emsg);
+ _("Failed to resume sub-download `%s': %s\n"), download,
+ emsg);
GNUNET_free (emsg);
}
}
}
if (update_srch != NULL)
{
- drh = get_read_handle (sc->h,
- GNUNET_FS_SYNC_PATH_CHILD_SEARCH, update_srch);
+ drh =
+ get_read_handle (sc->h, GNUNET_FS_SYNC_PATH_CHILD_SEARCH, update_srch);
if (drh != NULL)
{
deserialize_search (sc->h, drh, sr, update_srch);
if (GNUNET_OK != GNUNET_BIO_read_close (drh, &emsg))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to resume sub-search `%s': %s\n"),
- update_srch, emsg);
+ _("Failed to resume sub-search `%s': %s\n"), update_srch,
+ emsg);
GNUNET_free (emsg);
}
}
GNUNET_free (update_srch);
}
- GNUNET_CONTAINER_multihashmap_put (sc->master_result_map,
- &sr->key,
- sr,
+ GNUNET_CONTAINER_multihashmap_put (sc->master_result_map, &sr->key, sr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
{
* resume the download (put it in the queue). Does this
* recursively for the top-level download and all child
* downloads.
- *
+ *
* @param dc download to resume
*/
static void
*
* @param sc search being resumed
*/
-static void signal_search_resume (struct GNUNET_FS_SearchContext *sc);
+static void
+signal_search_resume (struct GNUNET_FS_SearchContext *sc);
/**
*
* @param sc search context to free
*/
-static void free_search_context (struct GNUNET_FS_SearchContext *sc);
+static void
+free_search_context (struct GNUNET_FS_SearchContext *sc);
/**
if (sc->serialization != NULL)
{
GNUNET_FS_remove_sync_file_ (sc->h,
- (sc->psearch_result == NULL)
- ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
- : GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
+ (sc->psearch_result ==
+ NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
+ GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
sc->serialization);
GNUNET_FS_remove_sync_dir_ (sc->h,
- (sc->psearch_result == NULL)
- ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
- : GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
+ (sc->psearch_result ==
+ NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
+ GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
sc->serialization);
}
GNUNET_free_non_null (sc->serialization);
GNUNET_FS_uri_destroy (sc->uri);
if (sc->master_result_map != NULL)
{
- GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
- &free_result, sc);
+ GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map, &free_result,
+ sc);
GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
}
GNUNET_free (sc);
(NULL == (dc->uri = GNUNET_FS_uri_parse (uris, &emsg))) ||
((GNUNET_YES != GNUNET_FS_uri_test_chk (dc->uri)) &&
(GNUNET_YES != GNUNET_FS_uri_test_loc (dc->uri))) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_meta_data (rh, "download-meta", &dc->meta)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_string (rh, "download-emsg", &dc->emsg, 10 * 1024)) ||
+ (GNUNET_OK != GNUNET_BIO_read_meta_data (rh, "download-meta", &dc->meta))
+ || (GNUNET_OK !=
+ GNUNET_BIO_read_string (rh, "download-emsg", &dc->emsg, 10 * 1024)) ||
(GNUNET_OK !=
GNUNET_BIO_read_string (rh, "download-fn", &dc->filename, 10 * 1024)) ||
(GNUNET_OK !=
}
if ((parent == NULL) && (search == NULL))
{
- dc->top = GNUNET_FS_make_top (dc->h,
- &GNUNET_FS_download_signal_suspend_, dc);
+ dc->top =
+ GNUNET_FS_make_top (dc->h, &GNUNET_FS_download_signal_suspend_, dc);
signal_download_resume (dc);
}
GNUNET_free (uris);
/**
- * Deserialize a search.
+ * Deserialize a search.
*
* @param h overall context
* @param rh file to deserialize from
}
sc->h = h;
sc->serialization = GNUNET_strdup (serialization);
- if ((GNUNET_OK !=
- GNUNET_BIO_read_string (rh, "search-uri", &uris, 10 * 1024)) ||
- (NULL == (sc->uri = GNUNET_FS_uri_parse (uris, &emsg))) ||
+ if ((GNUNET_OK != GNUNET_BIO_read_string (rh, "search-uri", &uris, 10 * 1024))
+ || (NULL == (sc->uri = GNUNET_FS_uri_parse (uris, &emsg))) ||
((GNUNET_YES != GNUNET_FS_uri_test_ksk (sc->uri)) &&
(GNUNET_YES != GNUNET_FS_uri_test_sks (sc->uri))) ||
- (GNUNET_OK !=
- read_start_time (rh, &sc->start_time)) ||
+ (GNUNET_OK != read_start_time (rh, &sc->start_time)) ||
(GNUNET_OK !=
GNUNET_BIO_read_string (rh, "search-emsg", &sc->emsg, 10 * 1024)) ||
- (GNUNET_OK !=
- GNUNET_BIO_read_int32 (rh, &options)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &options)) ||
(GNUNET_OK !=
GNUNET_BIO_read (rh, "search-pause", &in_pause, sizeof (in_pause))) ||
(GNUNET_OK != GNUNET_BIO_read_int32 (rh, &sc->anonymity)))
sc->options = (enum GNUNET_FS_SearchOptions) options;
sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16);
dn = get_serialization_file_name_in_dir (h,
- (sc->psearch_result == NULL)
- ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
- : GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
+ (sc->psearch_result ==
+ NULL) ?
+ GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
+ GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
sc->serialization, "");
if (dn != NULL)
{
* @param h the 'struct GNUNET_FS_Handle*'
*/
static void
-deserialization_master (const char *master_path,
- GNUNET_FileNameCallback proc,
+deserialization_master (const char *master_path, GNUNET_FileNameCallback proc,
struct GNUNET_FS_Handle *h)
{
char *dn;
* Setup a connection to the file-sharing service.
*
* @param cfg configuration to use
- * @param client_name unique identifier for this client
+ * @param client_name unique identifier for this client
* @param upcb function to call to notify about FS actions
* @param upcb_cls closure for upcb
* @param flags specific attributes for fs-operations
*/
struct GNUNET_FS_Handle *
GNUNET_FS_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
- const char *client_name,
- GNUNET_FS_ProgressCallback upcb,
+ const char *client_name, GNUNET_FS_ProgressCallback upcb,
void *upcb_cls, enum GNUNET_FS_Flags flags, ...)
{
struct GNUNET_FS_Handle *ret;
projects / oweals / gnunet.git / blobdiff