aboutsummaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-07-27 12:40:59 +0000
committerChristian Grothoff <christian@grothoff.org>2015-07-27 12:40:59 +0000
commit573220ae48411059a9784f02431192827d3014f5 (patch)
treeab8a6dfb0f4cf8f250a40548333ecec585a37394 /src/fs
parentce5d695ed70148d23061a9f8891156fcc7c08514 (diff)
downloadgnunet-573220ae48411059a9784f02431192827d3014f5.tar.gz
gnunet-573220ae48411059a9784f02431192827d3014f5.zip
-doxygen, indentation
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/fs_publish_ksk.c23
-rw-r--r--src/fs/fs_publish_ublock.c10
2 files changed, 20 insertions, 13 deletions
diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c
index 9d59a0389..05231adf2 100644
--- a/src/fs/fs_publish_ksk.c
+++ b/src/fs/fs_publish_ksk.c
@@ -105,11 +105,11 @@ struct GNUNET_FS_PublishKskContext
105 105
106 106
107/** 107/**
108 * Continuation of "GNUNET_FS_publish_ksk" that performs 108 * Continuation of #GNUNET_FS_publish_ksk() that performs
109 * the actual publishing operation (iterating over all 109 * the actual publishing operation (iterating over all
110 * of the keywords). 110 * of the keywords).
111 * 111 *
112 * @param cls closure of type "struct PublishKskContext*" 112 * @param cls closure of type `struct PublishKskContext *`
113 * @param tc unused 113 * @param tc unused
114 */ 114 */
115static void 115static void
@@ -121,7 +121,7 @@ publish_ksk_cont (void *cls,
121 * Function called by the datastore API with 121 * Function called by the datastore API with
122 * the result from the PUT request. 122 * the result from the PUT request.
123 * 123 *
124 * @param cls closure of type "struct GNUNET_FS_PublishKskContext*" 124 * @param cls closure of type `struct GNUNET_FS_PublishKskContext *`
125 * @param msg error message (or NULL) 125 * @param msg error message (or NULL)
126 */ 126 */
127static void 127static void
@@ -144,14 +144,15 @@ kb_put_cont (void *cls,
144 144
145 145
146/** 146/**
147 * Continuation of "GNUNET_FS_publish_ksk" that performs the actual 147 * Continuation of #GNUNET_FS_publish_ksk() that performs the actual
148 * publishing operation (iterating over all of the keywords). 148 * publishing operation (iterating over all of the keywords).
149 * 149 *
150 * @param cls closure of type "struct GNUNET_FS_PublishKskContext*" 150 * @param cls closure of type `struct GNUNET_FS_PublishKskContext *`
151 * @param tc unused 151 * @param tc unused
152 */ 152 */
153static void 153static void
154publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 154publish_ksk_cont (void *cls,
155 const struct GNUNET_SCHEDULER_TaskContext *tc)
155{ 156{
156 struct GNUNET_FS_PublishKskContext *pkc = cls; 157 struct GNUNET_FS_PublishKskContext *pkc = cls;
157 const char *keyword; 158 const char *keyword;
@@ -160,8 +161,10 @@ publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
160 if ( (pkc->i == pkc->ksk_uri->data.ksk.keywordCount) || 161 if ( (pkc->i == pkc->ksk_uri->data.ksk.keywordCount) ||
161 (NULL == pkc->dsh) ) 162 (NULL == pkc->dsh) )
162 { 163 {
163 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "KSK PUT operation complete\n"); 164 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
164 pkc->cont (pkc->cont_cls, pkc->ksk_uri, NULL); 165 "KSK PUT operation complete\n");
166 pkc->cont (pkc->cont_cls, pkc->ksk_uri,
167 NULL);
165 GNUNET_FS_publish_ksk_cancel (pkc); 168 GNUNET_FS_publish_ksk_cancel (pkc);
166 return; 169 return;
167 } 170 }
@@ -216,7 +219,9 @@ GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
216 pkc->dsh = GNUNET_DATASTORE_connect (h->cfg); 219 pkc->dsh = GNUNET_DATASTORE_connect (h->cfg);
217 if (NULL == pkc->dsh) 220 if (NULL == pkc->dsh)
218 { 221 {
219 cont (cont_cls, NULL, _("Could not connect to datastore.")); 222 cont (cont_cls,
223 NULL,
224 _("Could not connect to datastore."));
220 GNUNET_free (pkc); 225 GNUNET_free (pkc);
221 return NULL; 226 return NULL;
222 } 227 }
diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c
index 0212b2e64..bf760fb3f 100644
--- a/src/fs/fs_publish_ublock.c
+++ b/src/fs/fs_publish_ublock.c
@@ -121,9 +121,9 @@ struct GNUNET_FS_PublishUblockContext
121 * Continuation of #GNUNET_FS_publish_ublock_(). 121 * Continuation of #GNUNET_FS_publish_ublock_().
122 * 122 *
123 * @param cls closure of type "struct GNUNET_FS_PublishUblockContext*" 123 * @param cls closure of type "struct GNUNET_FS_PublishUblockContext*"
124 * @param success GNUNET_SYSERR on failure (including timeout/queue drop) 124 * @param success #GNUNET_SYSERR on failure (including timeout/queue drop)
125 * GNUNET_NO if content was already there 125 * #GNUNET_NO if content was already there
126 * GNUNET_YES (or other positive value) on success 126 * #GNUNET_YES (or other positive value) on success
127 * @param min_expiration minimum expiration time required for 0-priority content to be stored 127 * @param min_expiration minimum expiration time required for 0-priority content to be stored
128 * by the datacache at this time, zero for unknown, forever if we have no 128 * by the datacache at this time, zero for unknown, forever if we have no
129 * space for 0-priority content 129 * space for 0-priority content
@@ -285,7 +285,9 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h,
285 if (NULL != dsh) 285 if (NULL != dsh)
286 { 286 {
287 uc->qre = 287 uc->qre =
288 GNUNET_DATASTORE_put (dsh, 0, &query, 288 GNUNET_DATASTORE_put (dsh,
289 0,
290 &query,
289 ulen + slen + mdsize + sizeof (struct UBlock), 291 ulen + slen + mdsize + sizeof (struct UBlock),
290 ub_enc, 292 ub_enc,
291 GNUNET_BLOCK_TYPE_FS_UBLOCK, 293 GNUNET_BLOCK_TYPE_FS_UBLOCK,