diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-11-30 00:02:26 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-11-30 00:02:26 +0000 |
commit | b2f1bcafa32963ef1bbb9c00ea7b75c933c2016e (patch) | |
tree | 213cf86c269c6f61cfae3cb8e350d5ee1eb7f136 /src/include/gnunet_datastore_service.h | |
parent | d3ab6b114ef933c3810919f8bdb9f8c3ceb13774 (diff) | |
download | gnunet-b2f1bcafa32963ef1bbb9c00ea7b75c933c2016e.tar.gz gnunet-b2f1bcafa32963ef1bbb9c00ea7b75c933c2016e.zip |
applying patch from #3148 (by shedatc) to make gnunet-helper-nat-client compile on FreeBSD
Diffstat (limited to 'src/include/gnunet_datastore_service.h')
-rw-r--r-- | src/include/gnunet_datastore_service.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h index 3bbdc3c8a..9a9ba5429 100644 --- a/src/include/gnunet_datastore_service.h +++ b/src/include/gnunet_datastore_service.h | |||
@@ -83,9 +83,9 @@ GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h, int drop); | |||
83 | * operation. | 83 | * operation. |
84 | * | 84 | * |
85 | * @param cls closure | 85 | * @param cls closure |
86 | * @param success GNUNET_SYSERR on failure (including timeout/queue drop) | 86 | * @param success #GNUNET_SYSERR on failure (including timeout/queue drop) |
87 | * GNUNET_NO if content was already there | 87 | * #GNUNET_NO if content was already there |
88 | * GNUNET_YES (or other positive value) on success | 88 | * #GNUNET_YES (or other positive value) on success |
89 | * @param min_expiration minimum expiration time required for 0-priority content to be stored | 89 | * @param min_expiration minimum expiration time required for 0-priority content to be stored |
90 | * by the datacache at this time, zero for unknown, forever if we have no | 90 | * by the datacache at this time, zero for unknown, forever if we have no |
91 | * space for 0-priority content | 91 | * space for 0-priority content |
@@ -146,7 +146,7 @@ GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h, uint64_t amount, | |||
146 | * (if other requests of higher priority are in the queue) | 146 | * (if other requests of higher priority are in the queue) |
147 | * @param timeout timeout for the operation | 147 | * @param timeout timeout for the operation |
148 | * @param cont continuation to call when done | 148 | * @param cont continuation to call when done |
149 | * @param cont_cls closure for cont | 149 | * @param cont_cls closure for @a cont |
150 | * @return NULL if the entry was not queued, otherwise a handle that can be used to | 150 | * @return NULL if the entry was not queued, otherwise a handle that can be used to |
151 | * cancel; note that even if NULL is returned, the callback will be invoked | 151 | * cancel; note that even if NULL is returned, the callback will be invoked |
152 | * (or rather, will already have been invoked) | 152 | * (or rather, will already have been invoked) |
@@ -180,7 +180,7 @@ GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, uint32_t rid, | |||
180 | * (if other requests of higher priority are in the queue) | 180 | * (if other requests of higher priority are in the queue) |
181 | * @param timeout how long to wait at most for a response | 181 | * @param timeout how long to wait at most for a response |
182 | * @param cont continuation to call when done | 182 | * @param cont continuation to call when done |
183 | * @param cont_cls closure for cont | 183 | * @param cont_cls closure for @a cont |
184 | * @return NULL if the entry was not queued, otherwise a handle that can be used to | 184 | * @return NULL if the entry was not queued, otherwise a handle that can be used to |
185 | * cancel; note that even if NULL is returned, the callback will be invoked | 185 | * cancel; note that even if NULL is returned, the callback will be invoked |
186 | * (or rather, will already have been invoked) | 186 | * (or rather, will already have been invoked) |
@@ -206,7 +206,7 @@ GNUNET_DATASTORE_release_reserve (struct GNUNET_DATASTORE_Handle *h, | |||
206 | * (if other requests of higher priority are in the queue) | 206 | * (if other requests of higher priority are in the queue) |
207 | * @param timeout how long to wait at most for a response | 207 | * @param timeout how long to wait at most for a response |
208 | * @param cont continuation to call when done | 208 | * @param cont continuation to call when done |
209 | * @param cont_cls closure for cont | 209 | * @param cont_cls closure for @a cont |
210 | * @return NULL if the entry was not queued, otherwise a handle that can be used to | 210 | * @return NULL if the entry was not queued, otherwise a handle that can be used to |
211 | * cancel; note that even if NULL is returned, the callback will be invoked | 211 | * cancel; note that even if NULL is returned, the callback will be invoked |
212 | * (or rather, will already have been invoked) | 212 | * (or rather, will already have been invoked) |
@@ -223,22 +223,21 @@ GNUNET_DATASTORE_update (struct GNUNET_DATASTORE_Handle *h, uint64_t uid, | |||
223 | 223 | ||
224 | 224 | ||
225 | /** | 225 | /** |
226 | * Explicitly remove some content from the database. | 226 | * Explicitly remove some content from the database. @a cont will be |
227 | * The "cont"inuation will be called with status | 227 | * called with status #GNUNET_OK if content was removed, #GNUNET_NO if |
228 | * "GNUNET_OK" if content was removed, "GNUNET_NO" | 228 | * no matching entry was found and #GNUNET_SYSERR on all other types |
229 | * if no matching entry was found and "GNUNET_SYSERR" | 229 | * of errors. |
230 | * on all other types of errors. | ||
231 | * | 230 | * |
232 | * @param h handle to the datastore | 231 | * @param h handle to the datastore |
233 | * @param key key for the value | 232 | * @param key key for the value |
234 | * @param size number of bytes in data | 233 | * @param size number of bytes in @a data |
235 | * @param data content stored | 234 | * @param data content stored |
236 | * @param queue_priority ranking of this request in the priority queue | 235 | * @param queue_priority ranking of this request in the priority queue |
237 | * @param max_queue_size at what queue size should this request be dropped | 236 | * @param max_queue_size at what queue size should this request be dropped |
238 | * (if other requests of higher priority are in the queue) | 237 | * (if other requests of higher priority are in the queue) |
239 | * @param timeout how long to wait at most for a response | 238 | * @param timeout how long to wait at most for a response |
240 | * @param cont continuation to call when done | 239 | * @param cont continuation to call when done |
241 | * @param cont_cls closure for cont | 240 | * @param cont_cls closure for @a cont |
242 | * @return NULL if the entry was not queued, otherwise a handle that can be used to | 241 | * @return NULL if the entry was not queued, otherwise a handle that can be used to |
243 | * cancel; note that even if NULL is returned, the callback will be invoked | 242 | * cancel; note that even if NULL is returned, the callback will be invoked |
244 | * (or rather, will already have been invoked) | 243 | * (or rather, will already have been invoked) |
@@ -268,13 +267,13 @@ GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h, | |||
268 | * maybe 0 if no unique identifier is available | 267 | * maybe 0 if no unique identifier is available |
269 | */ | 268 | */ |
270 | typedef void (*GNUNET_DATASTORE_DatumProcessor) (void *cls, | 269 | typedef void (*GNUNET_DATASTORE_DatumProcessor) (void *cls, |
271 | const struct GNUNET_HashCode * key, | 270 | const struct GNUNET_HashCode *key, |
272 | size_t size, const void *data, | 271 | size_t size, const void *data, |
273 | enum GNUNET_BLOCK_Type type, | 272 | enum GNUNET_BLOCK_Type type, |
274 | uint32_t priority, | 273 | uint32_t priority, |
275 | uint32_t anonymity, | 274 | uint32_t anonymity, |
276 | struct GNUNET_TIME_Absolute | 275 | struct GNUNET_TIME_Absolute expiration, |
277 | expiration, uint64_t uid); | 276 | uint64_t uid); |
278 | 277 | ||
279 | 278 | ||
280 | /** | 279 | /** |
@@ -294,7 +293,7 @@ typedef void (*GNUNET_DATASTORE_DatumProcessor) (void *cls, | |||
294 | * @param timeout how long to wait at most for a response | 293 | * @param timeout how long to wait at most for a response |
295 | * @param proc function to call on a matching value; | 294 | * @param proc function to call on a matching value; |
296 | * or with a NULL value if no datum matches | 295 | * or with a NULL value if no datum matches |
297 | * @param proc_cls closure for proc | 296 | * @param proc_cls closure for @a proc |
298 | * @return NULL if the entry was not queued, otherwise a handle that can be used to | 297 | * @return NULL if the entry was not queued, otherwise a handle that can be used to |
299 | * cancel | 298 | * cancel |
300 | */ | 299 | */ |