aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-10-31 13:03:48 +0100
committerChristian Grothoff <christian@grothoff.org>2019-10-31 13:03:48 +0100
commit7e3cf5f461eb4fbb7581672bf0835da07c378136 (patch)
treebdc3874b7894242b095b892f1ed3e81a4d4f06c0 /src/include
parent01b480d6d026e0c537dc284a7e7df2c0320a3528 (diff)
downloadgnunet-7e3cf5f461eb4fbb7581672bf0835da07c378136.tar.gz
gnunet-7e3cf5f461eb4fbb7581672bf0835da07c378136.zip
tighten formatting rules
Diffstat (limited to 'src/include')
-rw-r--r--src/include/block_fs.h1
-rw-r--r--src/include/compat.h1
-rw-r--r--src/include/gnunet_abd_service.h125
-rw-r--r--src/include/gnunet_abe_lib.h1
-rw-r--r--src/include/gnunet_ats_service.h3
-rw-r--r--src/include/gnunet_bio_lib.h3
-rw-r--r--src/include/gnunet_block_plugin.h1
-rw-r--r--src/include/gnunet_common.h1
-rw-r--r--src/include/gnunet_configuration_lib.h1
-rw-r--r--src/include/gnunet_consensus_service.h2
-rw-r--r--src/include/gnunet_constants.h3
-rw-r--r--src/include/gnunet_datastore_service.h1
-rw-r--r--src/include/gnunet_dht_service.h2
-rw-r--r--src/include/gnunet_dns_service.h1
-rw-r--r--src/include/gnunet_dnsparser_lib.h1
-rw-r--r--src/include/gnunet_fragmentation_lib.h1
-rw-r--r--src/include/gnunet_fs_service.h4
-rw-r--r--src/include/gnunet_my_lib.h2
-rw-r--r--src/include/gnunet_namecache_service.h1
-rw-r--r--src/include/gnunet_nat_service.h2
-rw-r--r--src/include/gnunet_os_lib.h1
-rw-r--r--src/include/gnunet_rps_service.h1
-rw-r--r--src/include/gnunet_scheduler_lib.h4
-rw-r--r--src/include/gnunet_secretsharing_service.h1
-rw-r--r--src/include/gnunet_service_lib.h1
-rw-r--r--src/include/gnunet_set_service.h2
-rw-r--r--src/include/gnunet_sq_lib.h4
-rw-r--r--src/include/gnunet_statistics_service.h1
-rw-r--r--src/include/gnunet_strings_lib.h1
-rw-r--r--src/include/gnunet_testbed_service.h3
-rw-r--r--src/include/gnunet_testing_lib.h1
-rw-r--r--src/include/gnunet_time_lib.h2
-rw-r--r--src/include/platform.h1
33 files changed, 73 insertions, 107 deletions
diff --git a/src/include/block_fs.h b/src/include/block_fs.h
index 358fb43fa..e4caf6e50 100644
--- a/src/include/block_fs.h
+++ b/src/include/block_fs.h
@@ -41,7 +41,6 @@
41#define MAX_UBLOCK_SIZE (60 * 1024) 41#define MAX_UBLOCK_SIZE (60 * 1024)
42 42
43 43
44
45GNUNET_NETWORK_STRUCT_BEGIN 44GNUNET_NETWORK_STRUCT_BEGIN
46 45
47/** 46/**
diff --git a/src/include/compat.h b/src/include/compat.h
index 19badcefc..729e5e70a 100644
--- a/src/include/compat.h
+++ b/src/include/compat.h
@@ -44,6 +44,7 @@ void*
44GN_memrchr_ (const void *s, 44GN_memrchr_ (const void *s,
45 int c, 45 int c,
46 size_t n); 46 size_t n);
47
47#ifndef HAVE_MEMRCHR 48#ifndef HAVE_MEMRCHR
48#define memrchr(s, c, n) GN_memrchr_ (s, c, n) 49#define memrchr(s, c, n) GN_memrchr_ (s, c, n)
49#endif 50#endif
diff --git a/src/include/gnunet_abd_service.h b/src/include/gnunet_abd_service.h
index b50ff8b86..afec880f1 100644
--- a/src/include/gnunet_abd_service.h
+++ b/src/include/gnunet_abd_service.h
@@ -11,7 +11,7 @@
11 WITHOUT ANY WARRANTY; without even the implied warranty of 11 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Affero General Public License for more details. 13 Affero General Public License for more details.
14 14
15 You should have received a copy of the GNU Affero General Public License 15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. 16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17 17
@@ -58,15 +58,16 @@ struct GNUNET_ABD_Request;
58/* 58/*
59* Enum used for checking whether the issuer has the authority to issue credentials or is just a subject 59* Enum used for checking whether the issuer has the authority to issue credentials or is just a subject
60*/ 60*/
61enum GNUNET_ABD_CredentialFlags { 61enum GNUNET_ABD_CredentialFlags
62{
62 63
63 //Subject had credentials before, but have been revoked now 64 // Subject had credentials before, but have been revoked now
64 GNUNET_ABD_FLAG_REVOKED=0, 65 GNUNET_ABD_FLAG_REVOKED=0,
65 66
66 //Subject flag indicates that the subject is a holder of this credential and may present it as such 67 // Subject flag indicates that the subject is a holder of this credential and may present it as such
67 GNUNET_ABD_FLAG_SUBJECT=1, 68 GNUNET_ABD_FLAG_SUBJECT=1,
68 69
69 //Issuer flag is used to signify that the subject is allowed to issue this credential and delegate issuance 70 // Issuer flag is used to signify that the subject is allowed to issue this credential and delegate issuance
70 GNUNET_ABD_FLAG_ISSUER=2 71 GNUNET_ABD_FLAG_ISSUER=2
71 72
72}; 73};
@@ -75,7 +76,8 @@ GNUNET_NETWORK_STRUCT_BEGIN
75/** 76/**
76 * The attribute delegation record 77 * The attribute delegation record
77 */ 78 */
78struct GNUNET_ABD_DelegationRecord { 79struct GNUNET_ABD_DelegationRecord
80{
79 81
80 /** 82 /**
81 * Number of delegation sets in this record 83 * Number of delegation sets in this record
@@ -95,7 +97,8 @@ struct GNUNET_ABD_DelegationRecord {
95/** 97/**
96 * The attribute delegation record 98 * The attribute delegation record
97 */ 99 */
98struct GNUNET_ABD_DelegationRecordSet { 100struct GNUNET_ABD_DelegationRecordSet
101{
99 102
100 /** 103 /**
101 * Public key of the subject this attribute was delegated to 104 * Public key of the subject this attribute was delegated to
@@ -114,7 +117,8 @@ GNUNET_NETWORK_STRUCT_END
114/** 117/**
115 * The attribute delegation record 118 * The attribute delegation record
116 */ 119 */
117struct GNUNET_ABD_DelegationSet { 120struct GNUNET_ABD_DelegationSet
121{
118 122
119 /** 123 /**
120 * Public key of the subject this attribute was delegated to 124 * Public key of the subject this attribute was delegated to
@@ -133,7 +137,8 @@ struct GNUNET_ABD_DelegationSet {
133/** 137/**
134 * A delegation 138 * A delegation
135 */ 139 */
136struct GNUNET_ABD_Delegation { 140struct GNUNET_ABD_Delegation
141{
137 142
138 /** 143 /**
139 * The issuer of the delegation 144 * The issuer of the delegation
@@ -170,7 +175,8 @@ struct GNUNET_ABD_Delegation {
170/** 175/**
171 * A delegate 176 * A delegate
172 */ 177 */
173struct GNUNET_ABD_Delegate { 178struct GNUNET_ABD_Delegate
179{
174 180
175 /** 181 /**
176 * The issuer of the credential 182 * The issuer of the credential
@@ -217,12 +223,13 @@ struct GNUNET_ABD_Delegate {
217/* 223/*
218* Enum used for checking whether the issuer has the authority to issue credentials or is just a subject 224* Enum used for checking whether the issuer has the authority to issue credentials or is just a subject
219*/ 225*/
220enum GNUNET_ABD_AlgoDirectionFlags { 226enum GNUNET_ABD_AlgoDirectionFlags
227{
221 228
222 //Subject had credentials before, but have been revoked now 229 // Subject had credentials before, but have been revoked now
223 GNUNET_ABD_FLAG_FORWARD=1 << 0, 230 GNUNET_ABD_FLAG_FORWARD=1 << 0,
224 231
225 //Subject flag indicates that the subject is a holder of this credential and may present it as such 232 // Subject flag indicates that the subject is a holder of this credential and may present it as such
226 GNUNET_ABD_FLAG_BACKWARD=1 << 1 233 GNUNET_ABD_FLAG_BACKWARD=1 << 1
227 234
228}; 235};
@@ -256,14 +263,19 @@ GNUNET_ABD_disconnect (struct GNUNET_ABD_Handle *handle);
256 * @param delegate the delegates 263 * @param delegate the delegates
257 */ 264 */
258typedef void (*GNUNET_ABD_CredentialResultProcessor) (void *cls, 265typedef void (*GNUNET_ABD_CredentialResultProcessor) (void *cls,
259 unsigned int d_count, 266 unsigned int d_count,
260 struct GNUNET_ABD_Delegation *delegation_chain, 267 struct
261 unsigned int c_count, 268 GNUNET_ABD_Delegation *
262 struct GNUNET_ABD_Delegate *delegte); 269 delegation_chain,
263 270 unsigned int c_count,
271 struct GNUNET_ABD_Delegate
272 *delegte);
273
264typedef void (*GNUNET_ABD_IntermediateResultProcessor) (void *cls, 274typedef void (*GNUNET_ABD_IntermediateResultProcessor) (void *cls,
265 struct GNUNET_ABD_Delegation *delegation, 275 struct
266 bool is_bw); 276 GNUNET_ABD_Delegation *
277 delegation,
278 bool is_bw);
267 279
268/** 280/**
269 * Iterator called on obtained result for an attribute delegation. 281 * Iterator called on obtained result for an attribute delegation.
@@ -273,7 +285,7 @@ typedef void (*GNUNET_ABD_IntermediateResultProcessor) (void *cls,
273 * @param result the record data that can be handed to the subject 285 * @param result the record data that can be handed to the subject
274 */ 286 */
275typedef void (*GNUNET_ABD_DelegateResultProcessor) (void *cls, 287typedef void (*GNUNET_ABD_DelegateResultProcessor) (void *cls,
276 uint32_t success); 288 uint32_t success);
277 289
278/** 290/**
279 * Iterator called on obtained result for an attribute delegation removal. 291 * Iterator called on obtained result for an attribute delegation removal.
@@ -283,7 +295,7 @@ typedef void (*GNUNET_ABD_DelegateResultProcessor) (void *cls,
283 * @param result the record data that can be handed to the subject 295 * @param result the record data that can be handed to the subject
284 */ 296 */
285typedef void (*GNUNET_ABD_RemoveDelegateResultProcessor) (void *cls, 297typedef void (*GNUNET_ABD_RemoveDelegateResultProcessor) (void *cls,
286 uint32_t success); 298 uint32_t success);
287 299
288 300
289/** 301/**
@@ -305,28 +317,28 @@ typedef void (*GNUNET_ABD_RemoveDelegateResultProcessor) (void *cls,
305 * @return handle to the queued request 317 * @return handle to the queued request
306 */ 318 */
307struct GNUNET_ABD_Request* 319struct GNUNET_ABD_Request*
308GNUNET_ABD_verify (struct GNUNET_ABD_Handle *handle, 320 GNUNET_ABD_verify (struct GNUNET_ABD_Handle *handle,
309 const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key, 321 const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key,
310 const char *issuer_attribute, 322 const char *issuer_attribute,
311 const struct GNUNET_CRYPTO_EcdsaPublicKey *subject_key, 323 const struct GNUNET_CRYPTO_EcdsaPublicKey *subject_key,
312 uint32_t delegate_count, 324 uint32_t delegate_count,
313 const struct GNUNET_ABD_Delegate *delegates, 325 const struct GNUNET_ABD_Delegate *delegates,
314 enum GNUNET_ABD_AlgoDirectionFlags direction, 326 enum GNUNET_ABD_AlgoDirectionFlags direction,
315 GNUNET_ABD_CredentialResultProcessor proc, 327 GNUNET_ABD_CredentialResultProcessor proc,
316 void *proc_cls, 328 void *proc_cls,
317 GNUNET_ABD_IntermediateResultProcessor, 329 GNUNET_ABD_IntermediateResultProcessor,
318 void *proc2_cls); 330 void *proc2_cls);
319 331
320struct GNUNET_ABD_Request* 332struct GNUNET_ABD_Request*
321GNUNET_ABD_collect (struct GNUNET_ABD_Handle *handle, 333 GNUNET_ABD_collect (struct GNUNET_ABD_Handle *handle,
322 const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key, 334 const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key,
323 const char *issuer_attribute, 335 const char *issuer_attribute,
324 const struct GNUNET_CRYPTO_EcdsaPrivateKey *subject_key, 336 const struct GNUNET_CRYPTO_EcdsaPrivateKey *subject_key,
325 enum GNUNET_ABD_AlgoDirectionFlags direction, 337 enum GNUNET_ABD_AlgoDirectionFlags direction,
326 GNUNET_ABD_CredentialResultProcessor proc, 338 GNUNET_ABD_CredentialResultProcessor proc,
327 void *proc_cls, 339 void *proc_cls,
328 GNUNET_ABD_IntermediateResultProcessor, 340 GNUNET_ABD_IntermediateResultProcessor,
329 void *proc2_cls); 341 void *proc2_cls);
330 342
331/** 343/**
332 * Delegate an attribute 344 * Delegate an attribute
@@ -342,12 +354,12 @@ GNUNET_ABD_collect (struct GNUNET_ABD_Handle *handle,
342 */ 354 */
343struct GNUNET_ABD_Request * 355struct GNUNET_ABD_Request *
344GNUNET_ABD_add_delegation (struct GNUNET_ABD_Handle *handle, 356GNUNET_ABD_add_delegation (struct GNUNET_ABD_Handle *handle,
345 struct GNUNET_IDENTITY_Ego *issuer, 357 struct GNUNET_IDENTITY_Ego *issuer,
346 const char *attribute, 358 const char *attribute,
347 struct GNUNET_CRYPTO_EcdsaPublicKey *subject, 359 struct GNUNET_CRYPTO_EcdsaPublicKey *subject,
348 const char *delegated_attribute, 360 const char *delegated_attribute,
349 GNUNET_ABD_DelegateResultProcessor proc, 361 GNUNET_ABD_DelegateResultProcessor proc,
350 void *proc_cls); 362 void *proc_cls);
351 363
352/** 364/**
353 * Remove a delegation 365 * Remove a delegation
@@ -361,11 +373,10 @@ GNUNET_ABD_add_delegation (struct GNUNET_ABD_Handle *handle,
361 */ 373 */
362struct GNUNET_ABD_Request * 374struct GNUNET_ABD_Request *
363GNUNET_ABD_remove_delegation (struct GNUNET_ABD_Handle *handle, 375GNUNET_ABD_remove_delegation (struct GNUNET_ABD_Handle *handle,
364 struct GNUNET_IDENTITY_Ego *issuer, 376 struct GNUNET_IDENTITY_Ego *issuer,
365 const char *attribute, 377 const char *attribute,
366 GNUNET_ABD_RemoveDelegateResultProcessor proc, 378 GNUNET_ABD_RemoveDelegateResultProcessor proc,
367 void *proc_cls); 379 void *proc_cls);
368
369 380
370 381
371/** 382/**
@@ -379,10 +390,10 @@ GNUNET_ABD_remove_delegation (struct GNUNET_ABD_Handle *handle,
379 */ 390 */
380struct GNUNET_ABD_Delegate* 391struct GNUNET_ABD_Delegate*
381GNUNET_ABD_delegate_issue (const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer, 392GNUNET_ABD_delegate_issue (const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer,
382 struct GNUNET_CRYPTO_EcdsaPublicKey *subject, 393 struct GNUNET_CRYPTO_EcdsaPublicKey *subject,
383 const char *iss_attr, 394 const char *iss_attr,
384 const char *sub_attr, 395 const char *sub_attr,
385 struct GNUNET_TIME_Absolute *expiration); 396 struct GNUNET_TIME_Absolute *expiration);
386 397
387 398
388/** 399/**
diff --git a/src/include/gnunet_abe_lib.h b/src/include/gnunet_abe_lib.h
index fd1df9f0d..7aeb3520d 100644
--- a/src/include/gnunet_abe_lib.h
+++ b/src/include/gnunet_abe_lib.h
@@ -52,7 +52,6 @@ struct GNUNET_CRYPTO_AbeMasterKey;
52struct GNUNET_CRYPTO_AbeKey; 52struct GNUNET_CRYPTO_AbeKey;
53 53
54 54
55
56/** 55/**
57 * @ingroup abe 56 * @ingroup abe
58 * Create a new CP-ABE master key. Caller must free return value. 57 * Create a new CP-ABE master key. Caller must free return value.
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index cd1e62bee..8b8ce3f02 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -148,7 +148,6 @@ struct GNUNET_ATS_PropertiesNBO
148}; 148};
149 149
150 150
151
152/* ********************* LAN Characterization library ************************ */ 151/* ********************* LAN Characterization library ************************ */
153/* Note: these functions do not really communicate with the ATS service */ 152/* Note: these functions do not really communicate with the ATS service */
154 153
@@ -175,7 +174,6 @@ GNUNET_ATS_properties_ntoh (struct GNUNET_ATS_Properties *hbo,
175 const struct GNUNET_ATS_PropertiesNBO *nbo); 174 const struct GNUNET_ATS_PropertiesNBO *nbo);
176 175
177 176
178
179/* ********************Connection Suggestion API ***************************** */ 177/* ********************Connection Suggestion API ***************************** */
180 178
181/** 179/**
@@ -379,7 +377,6 @@ void
379GNUNET_ATS_address_destroy (struct GNUNET_ATS_AddressRecord *ar); 377GNUNET_ATS_address_destroy (struct GNUNET_ATS_AddressRecord *ar);
380 378
381 379
382
383/* ******************************** Performance API ***************************** */ 380/* ******************************** Performance API ***************************** */
384 381
385/** 382/**
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index 5529ca8f4..34dd46dd5 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -137,7 +137,6 @@ GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h, const char *what,
137 f, sizeof(float))) 137 f, sizeof(float)))
138 138
139 139
140
141/** 140/**
142 * Read a double. 141 * Read a double.
143 * 142 *
@@ -270,7 +269,6 @@ GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
270 const struct GNUNET_CONTAINER_MetaData *m); 269 const struct GNUNET_CONTAINER_MetaData *m);
271 270
272 271
273
274/** 272/**
275 * Write a float. 273 * Write a float.
276 * 274 *
@@ -280,7 +278,6 @@ GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
280#define GNUNET_BIO_write_float(h, f) GNUNET_BIO_write (h, &f, sizeof(float)) 278#define GNUNET_BIO_write_float(h, f) GNUNET_BIO_write (h, &f, sizeof(float))
281 279
282 280
283
284/** 281/**
285 * Write a double. 282 * Write a double.
286 * 283 *
diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h
index b01134f09..ee237ac03 100644
--- a/src/include/gnunet_block_plugin.h
+++ b/src/include/gnunet_block_plugin.h
@@ -215,7 +215,6 @@ typedef int
215 struct GNUNET_HashCode *key); 215 struct GNUNET_HashCode *key);
216 216
217 217
218
219/** 218/**
220 * Each plugin is required to return a pointer to a struct of this 219 * Each plugin is required to return a pointer to a struct of this
221 * type as the return value from its entry point. 220 * type as the return value from its entry point.
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 4af43d857..4fdc2d777 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -418,6 +418,7 @@ GNUNET_get_log_call_status (int caller_level,
418 const char *file, 418 const char *file,
419 const char *function, 419 const char *function,
420 int line); 420 int line);
421
421#endif 422#endif
422 423
423 424
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index 4df8d8965..302429430 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -341,7 +341,6 @@ GNUNET_CONFIGURATION_get_value_time (const struct
341 struct GNUNET_TIME_Relative *time); 341 struct GNUNET_TIME_Relative *time);
342 342
343 343
344
345/** 344/**
346 * Get a configuration value that should be a size in bytes. 345 * Get a configuration value that should be a size in bytes.
347 * 346 *
diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h
index 35cf424fb..9387aa095 100644
--- a/src/include/gnunet_consensus_service.h
+++ b/src/include/gnunet_consensus_service.h
@@ -68,7 +68,6 @@ typedef void (*GNUNET_CONSENSUS_ElementCallback) (void *cls,
68 GNUNET_SET_Element *element); 68 GNUNET_SET_Element *element);
69 69
70 70
71
72/** 71/**
73 * Opaque handle for the consensus service. 72 * Opaque handle for the consensus service.
74 */ 73 */
@@ -139,7 +138,6 @@ GNUNET_CONSENSUS_insert (struct GNUNET_CONSENSUS_Handle *consensus,
139 void *idc_cls); 138 void *idc_cls);
140 139
141 140
142
143/** 141/**
144 * Called when a conclusion was successful. 142 * Called when a conclusion was successful.
145 * 143 *
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index e2678a60e..e1572635f 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -41,7 +41,6 @@ extern "C"
41#endif 41#endif
42 42
43 43
44
45/** 44/**
46 * Bandwidth (in/out) to assume initially (before either peer has 45 * Bandwidth (in/out) to assume initially (before either peer has
47 * communicated any particular preference). Should be rather low; set 46 * communicated any particular preference). Should be rather low; set
@@ -165,8 +164,6 @@ extern "C"
165#define GNUNET_CONSTANTS_BLOOMFILTER_K 16 164#define GNUNET_CONSTANTS_BLOOMFILTER_K 16
166 165
167 166
168
169
170#if 0 /* keep Emacsens' auto-indent happy */ 167#if 0 /* keep Emacsens' auto-indent happy */
171{ 168{
172#endif 169#endif
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index 57b813225..c99db67bc 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -341,7 +341,6 @@ GNUNET_DATASTORE_get_for_replication (struct GNUNET_DATASTORE_Handle *h,
341 void *proc_cls); 341 void *proc_cls);
342 342
343 343
344
345/** 344/**
346 * Cancel a datastore operation. The final callback from the 345 * Cancel a datastore operation. The final callback from the
347 * operation must not have been done yet. 346 * operation must not have been done yet.
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index 573a800e5..ea3ea92fa 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -55,7 +55,6 @@ extern "C"
55 GNUNET_TIME_UNIT_MINUTES, 60) 55 GNUNET_TIME_UNIT_MINUTES, 60)
56 56
57 57
58
59/** 58/**
60 * Connection to the DHT service. 59 * Connection to the DHT service.
61 */ 60 */
@@ -356,7 +355,6 @@ typedef void
356 size_t size); 355 size_t size);
357 356
358 357
359
360/** 358/**
361 * Start monitoring the local DHT service. 359 * Start monitoring the local DHT service.
362 * 360 *
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h
index da2881e5b..66f6890f8 100644
--- a/src/include/gnunet_dns_service.h
+++ b/src/include/gnunet_dns_service.h
@@ -96,7 +96,6 @@ enum GNUNET_DNS_Flags
96}; 96};
97 97
98 98
99
100/** 99/**
101 * Signature of a function that is called whenever the DNS service 100 * Signature of a function that is called whenever the DNS service
102 * encounters a DNS request and needs to do something with it. The 101 * encounters a DNS request and needs to do something with it. The
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index cbb53e416..8d882a216 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -407,7 +407,6 @@ struct GNUNET_DNSPARSER_CaaRecord
407}; 407};
408 408
409 409
410
411/** 410/**
412 * Binary record information (unparsed). 411 * Binary record information (unparsed).
413 */ 412 */
diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h
index 6683a08d7..512a9b93b 100644
--- a/src/include/gnunet_fragmentation_lib.h
+++ b/src/include/gnunet_fragmentation_lib.h
@@ -218,7 +218,6 @@ GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc,
218 const struct GNUNET_MessageHeader *msg); 218 const struct GNUNET_MessageHeader *msg);
219 219
220 220
221
222#if 0 /* keep Emacsens' auto-indent happy */ 221#if 0 /* keep Emacsens' auto-indent happy */
223{ 222{
224#endif 223#endif
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 2b25b5c81..01d736e89 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -103,7 +103,6 @@ typedef int
103 int is_mandatory); 103 int is_mandatory);
104 104
105 105
106
107/** 106/**
108 * Get a unique key from a URI. This is for putting URIs 107 * Get a unique key from a URI. This is for putting URIs
109 * into HashMaps. The key may change between FS implementations. 108 * into HashMaps. The key may change between FS implementations.
@@ -491,7 +490,6 @@ GNUNET_FS_getopt_set_metadata (struct
491 const char *value); 490 const char *value);
492 491
493 492
494
495/* ************************* sharing API ***************** */ 493/* ************************* sharing API ***************** */
496 494
497 495
@@ -2343,7 +2341,6 @@ enum GNUNET_FS_DownloadOptions
2343}; 2341};
2344 2342
2345 2343
2346
2347/** 2344/**
2348 * Download parts of a file. Note that this will store 2345 * Download parts of a file. Note that this will store
2349 * the blocks at the respective offset in the given file. Also, the 2346 * the blocks at the respective offset in the given file. Also, the
@@ -2456,7 +2453,6 @@ void
2456GNUNET_FS_download_resume (struct GNUNET_FS_DownloadContext *dc); 2453GNUNET_FS_download_resume (struct GNUNET_FS_DownloadContext *dc);
2457 2454
2458 2455
2459
2460/* ******************** Directory API *********************** */ 2456/* ******************** Directory API *********************** */
2461 2457
2462 2458
diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h
index 04dddeb92..74e7bf492 100644
--- a/src/include/gnunet_my_lib.h
+++ b/src/include/gnunet_my_lib.h
@@ -44,7 +44,6 @@ extern "C"
44#endif 44#endif
45 45
46 46
47
48/** 47/**
49 * Information we pass to #GNUNET_MY_exec_prepared() to 48 * Information we pass to #GNUNET_MY_exec_prepared() to
50 * initialize the arguments of the prepared statement. 49 * initialize the arguments of the prepared statement.
@@ -258,7 +257,6 @@ struct GNUNET_MY_ResultSpec
258#define GNUNET_MY_result_spec_end { NULL, NULL, NULL, 0, NULL, 0, 0 } 257#define GNUNET_MY_result_spec_end { NULL, NULL, NULL, 0, NULL, 0, 0 }
259 258
260 259
261
262/** 260/**
263 * Obtain fixed size result of @a ptr_size bytes from 261 * Obtain fixed size result of @a ptr_size bytes from
264 * MySQL, store in already allocated buffer at @a ptr. 262 * MySQL, store in already allocated buffer at @a ptr.
diff --git a/src/include/gnunet_namecache_service.h b/src/include/gnunet_namecache_service.h
index da2121d31..07b26aec3 100644
--- a/src/include/gnunet_namecache_service.h
+++ b/src/include/gnunet_namecache_service.h
@@ -104,7 +104,6 @@ typedef void
104 const char *emsg); 104 const char *emsg);
105 105
106 106
107
108/** 107/**
109 * Store an item in the namecache. If the item is already present, 108 * Store an item in the namecache. If the item is already present,
110 * it is replaced with the new record. 109 * it is replaced with the new record.
diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h
index 4273b5ad1..b66c188cc 100644
--- a/src/include/gnunet_nat_service.h
+++ b/src/include/gnunet_nat_service.h
@@ -236,7 +236,6 @@ enum GNUNET_NAT_StatusCode
236}; 236};
237 237
238 238
239
240/** 239/**
241 * What the situation of the NAT connectivity 240 * What the situation of the NAT connectivity
242 */ 241 */
@@ -269,7 +268,6 @@ enum GNUNET_NAT_Type
269}; 268};
270 269
271 270
272
273/** 271/**
274 * Signature of the callback passed to #GNUNET_NAT_register() for 272 * Signature of the callback passed to #GNUNET_NAT_register() for
275 * a function to call whenever our set of 'valid' addresses changes. 273 * a function to call whenever our set of 'valid' addresses changes.
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index e4c0d6cdb..2eada2783 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -625,7 +625,6 @@ int
625GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc); 625GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc);
626 626
627 627
628
629/** 628/**
630 * Retrieve the status of a process, waiting on it if dead. 629 * Retrieve the status of a process, waiting on it if dead.
631 * Blocking version. 630 * Blocking version.
diff --git a/src/include/gnunet_rps_service.h b/src/include/gnunet_rps_service.h
index b6f2e2456..f5df8639f 100644
--- a/src/include/gnunet_rps_service.h
+++ b/src/include/gnunet_rps_service.h
@@ -200,6 +200,7 @@ GNUNET_RPS_act_malicious (struct GNUNET_RPS_Handle *h,
200 uint32_t num_peers, 200 uint32_t num_peers,
201 const struct GNUNET_PeerIdentity *ids, 201 const struct GNUNET_PeerIdentity *ids,
202 const struct GNUNET_PeerIdentity *target_peer); 202 const struct GNUNET_PeerIdentity *target_peer);
203
203#endif /* ENABLE_MALICIOUS */ 204#endif /* ENABLE_MALICIOUS */
204 205
205/* Get internals for debugging/profiling purposes */ 206/* Get internals for debugging/profiling purposes */
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index da968737e..b828e2db7 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -209,8 +209,6 @@ struct GNUNET_SCHEDULER_TaskContext
209}; 209};
210 210
211 211
212
213
214/** 212/**
215 * Function used by event-loop implementations to signal the scheduler 213 * Function used by event-loop implementations to signal the scheduler
216 * that a particular @a task is ready due to an event specified in the 214 * that a particular @a task is ready due to an event specified in the
@@ -907,7 +905,6 @@ GNUNET_SCHEDULER_set_select (GNUNET_SCHEDULER_select new_select,
907 void *new_select_cls); 905 void *new_select_cls);
908 906
909 907
910
911/** 908/**
912 * Change the async scope for the currently executing task and (transitively) 909 * Change the async scope for the currently executing task and (transitively)
913 * for all tasks scheduled by the current task after calling this function. 910 * for all tasks scheduled by the current task after calling this function.
@@ -924,7 +921,6 @@ void
924GNUNET_SCHEDULER_begin_async_scope (struct GNUNET_AsyncScopeId *aid); 921GNUNET_SCHEDULER_begin_async_scope (struct GNUNET_AsyncScopeId *aid);
925 922
926 923
927
928#if 0 /* keep Emacsens' auto-indent happy */ 924#if 0 /* keep Emacsens' auto-indent happy */
929{ 925{
930#endif 926#endif
diff --git a/src/include/gnunet_secretsharing_service.h b/src/include/gnunet_secretsharing_service.h
index 9bacee06e..127f1db78 100644
--- a/src/include/gnunet_secretsharing_service.h
+++ b/src/include/gnunet_secretsharing_service.h
@@ -95,7 +95,6 @@ extern "C"
95 "1d7024c3650f60d0da" 95 "1d7024c3650f60d0da"
96 96
97 97
98
99/** 98/**
100 * Session that will eventually establish a shared secred between 99 * Session that will eventually establish a shared secred between
101 * the involved peers and allow encryption and cooperative decryption. 100 * the involved peers and allow encryption and cooperative decryption.
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index 19a5fb89b..ad238a0fa 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -84,7 +84,6 @@ enum GNUNET_SERVICE_Options
84}; 84};
85 85
86 86
87
88/* **************** NEW SERVICE API ********************** */ 87/* **************** NEW SERVICE API ********************** */
89 88
90/** 89/**
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h
index 13f761d7d..187c65626 100644
--- a/src/include/gnunet_set_service.h
+++ b/src/include/gnunet_set_service.h
@@ -153,7 +153,6 @@ enum GNUNET_SET_Status
153}; 153};
154 154
155 155
156
157/** 156/**
158 * The way results are given to the client. 157 * The way results are given to the client.
159 */ 158 */
@@ -324,7 +323,6 @@ typedef void
324 struct GNUNET_SET_Request *request); 323 struct GNUNET_SET_Request *request);
325 324
326 325
327
328typedef void 326typedef void
329(*GNUNET_SET_CopyReadyCallback) (void *cls, 327(*GNUNET_SET_CopyReadyCallback) (void *cls,
330 struct GNUNET_SET_Handle *copy); 328 struct GNUNET_SET_Handle *copy);
diff --git a/src/include/gnunet_sq_lib.h b/src/include/gnunet_sq_lib.h
index b6b09eb67..21ce5b393 100644
--- a/src/include/gnunet_sq_lib.h
+++ b/src/include/gnunet_sq_lib.h
@@ -98,7 +98,6 @@ GNUNET_SQ_query_param_fixed_size (const void *ptr,
98 size_t ptr_size); 98 size_t ptr_size);
99 99
100 100
101
102/** 101/**
103 * Generate query parameter for a string. 102 * Generate query parameter for a string.
104 * 103 *
@@ -452,7 +451,6 @@ void
452GNUNET_SQ_cleanup_result (struct GNUNET_SQ_ResultSpec *rs); 451GNUNET_SQ_cleanup_result (struct GNUNET_SQ_ResultSpec *rs);
453 452
454 453
455
456/* ******************** sq_prepare.c functions ************** */ 454/* ******************** sq_prepare.c functions ************** */
457 455
458 456
@@ -492,7 +490,6 @@ GNUNET_SQ_make_prepare (const char *sql,
492 sqlite3_stmt **pstmt); 490 sqlite3_stmt **pstmt);
493 491
494 492
495
496/** 493/**
497 * Prepare all statements given in the (NULL,NULL)-terminated 494 * Prepare all statements given in the (NULL,NULL)-terminated
498 * array at @a ps 495 * array at @a ps
@@ -568,7 +565,6 @@ GNUNET_SQ_exec_statements (sqlite3 *dbh,
568 const struct GNUNET_SQ_ExecuteStatement *es); 565 const struct GNUNET_SQ_ExecuteStatement *es);
569 566
570 567
571
572#endif /* GNUNET_SQ_LIB_H_ */ 568#endif /* GNUNET_SQ_LIB_H_ */
573 569
574/* end of include/gnunet_sq_lib.h */ 570/* end of include/gnunet_sq_lib.h */
diff --git a/src/include/gnunet_statistics_service.h b/src/include/gnunet_statistics_service.h
index dfb03d67a..20e958865 100644
--- a/src/include/gnunet_statistics_service.h
+++ b/src/include/gnunet_statistics_service.h
@@ -218,7 +218,6 @@ GNUNET_STATISTICS_update (struct GNUNET_STATISTICS_Handle *handle,
218 int make_persistent); 218 int make_persistent);
219 219
220 220
221
222#if 0 /* keep Emacsens' auto-indent happy */ 221#if 0 /* keep Emacsens' auto-indent happy */
223{ 222{
224#endif 223#endif
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index 7f532c97a..0c659bfb3 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -235,7 +235,6 @@ GNUNET_STRINGS_buffer_tokenize (const char *buffer,
235 unsigned int count, ...); 235 unsigned int count, ...);
236 236
237 237
238
239/** 238/**
240 * @ingroup time 239 * @ingroup time
241 * Like `asctime`, except for GNUnet time. Converts a GNUnet internal 240 * Like `asctime`, except for GNUnet time. Converts a GNUnet internal
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index d45f5bc34..03c372623 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -95,7 +95,6 @@ GNUNET_TESTBED_host_create (const char *hostname,
95 uint16_t port); 95 uint16_t port);
96 96
97 97
98
99/** 98/**
100 * Create a host to run peers and controllers on. This function is used 99 * Create a host to run peers and controllers on. This function is used
101 * if a peer learns about a host via IPC between controllers (and thus 100 * if a peer learns about a host via IPC between controllers (and thus
@@ -875,7 +874,6 @@ GNUNET_TESTBED_shutdown_peers (struct GNUNET_TESTBED_Controller *c,
875 void *cb_cls); 874 void *cb_cls);
876 875
877 876
878
879/** 877/**
880 * Options for peer connections. 878 * Options for peer connections.
881 */ 879 */
@@ -943,7 +941,6 @@ GNUNET_TESTBED_underlay_configure_link (void *op_cls,
943 ...); 941 ...);
944 942
945 943
946
947/** 944/**
948 * Topologies and topology options supported for testbeds. Options should always 945 * Topologies and topology options supported for testbeds. Options should always
949 * end with #GNUNET_TESTBED_TOPOLOGY_OPTION_END 946 * end with #GNUNET_TESTBED_TOPOLOGY_OPTION_END
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 3c3ef8f2e..22e142e43 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -242,6 +242,7 @@ GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
242int 242int
243GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system, 243GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
244 struct GNUNET_CONFIGURATION_Handle *cfg); 244 struct GNUNET_CONFIGURATION_Handle *cfg);
245
245// FIXME: add dual to 'release' ports again... 246// FIXME: add dual to 'release' ports again...
246 247
247 248
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index fd6010f5d..6f14de2f4 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -163,7 +163,6 @@ GNUNET_NETWORK_STRUCT_END
163#define GNUNET_TIME_UNIT_FOREVER_ABS GNUNET_TIME_absolute_get_forever_ () 163#define GNUNET_TIME_UNIT_FOREVER_ABS GNUNET_TIME_absolute_get_forever_ ()
164 164
165 165
166
167/** 166/**
168 * Threshold after which exponential backoff should not increase (15 m). 167 * Threshold after which exponential backoff should not increase (15 m).
169 */ 168 */
@@ -326,7 +325,6 @@ GNUNET_TIME_relative_min (struct GNUNET_TIME_Relative t1,
326 struct GNUNET_TIME_Relative t2); 325 struct GNUNET_TIME_Relative t2);
327 326
328 327
329
330/** 328/**
331 * Return the maximum of two relative time values. 329 * Return the maximum of two relative time values.
332 * 330 *
diff --git a/src/include/platform.h b/src/include/platform.h
index 85f451bea..dd5e28760 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -205,6 +205,7 @@
205#if ! HAVE_ATOLL 205#if ! HAVE_ATOLL
206long long 206long long
207atoll (const char *nptr); 207atoll (const char *nptr);
208
208#endif 209#endif
209 210
210#if ENABLE_NLS 211#if ENABLE_NLS