diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-16 20:21:27 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-16 20:21:27 +0000 |
commit | accfd6bd85274da2f19e7230c8da6b273cfb2ece (patch) | |
tree | 60966194963795ff07b4da94f4efb6c46d6a23cf /src/include | |
parent | 3d670727232e79b7e49a1df7ba9260db4e5798a0 (diff) | |
download | gnunet-accfd6bd85274da2f19e7230c8da6b273cfb2ece.tar.gz gnunet-accfd6bd85274da2f19e7230c8da6b273cfb2ece.zip |
-another renaming fest for GNUNET_NAMESTORE_ to GNUNET_GNSRECORD_ symbols that were moved
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_conversation_service.h | 2 | ||||
-rw-r--r-- | src/include/gnunet_gns_service.h | 2 | ||||
-rw-r--r-- | src/include/gnunet_gnsrecord_lib.h | 80 | ||||
-rw-r--r-- | src/include/gnunet_namecache_plugin.h | 4 | ||||
-rw-r--r-- | src/include/gnunet_namecache_service.h | 4 | ||||
-rw-r--r-- | src/include/gnunet_namestore_plugin.h | 12 | ||||
-rw-r--r-- | src/include/gnunet_namestore_service.h | 12 |
7 files changed, 58 insertions, 58 deletions
diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h index 3ef3c2f3d..70dd013d6 100644 --- a/src/include/gnunet_conversation_service.h +++ b/src/include/gnunet_conversation_service.h | |||
@@ -203,7 +203,7 @@ GNUNET_CONVERSATION_phone_create (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
203 | */ | 203 | */ |
204 | void | 204 | void |
205 | GNUNET_CONVERSATION_phone_get_record (struct GNUNET_CONVERSATION_Phone *phone, | 205 | GNUNET_CONVERSATION_phone_get_record (struct GNUNET_CONVERSATION_Phone *phone, |
206 | struct GNUNET_NAMESTORE_RecordData *rd); | 206 | struct GNUNET_GNSRECORD_Data *rd); |
207 | 207 | ||
208 | 208 | ||
209 | /** | 209 | /** |
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h index f26b44265..36ca0ab5e 100644 --- a/src/include/gnunet_gns_service.h +++ b/src/include/gnunet_gns_service.h | |||
@@ -84,7 +84,7 @@ GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle); | |||
84 | */ | 84 | */ |
85 | typedef void (*GNUNET_GNS_LookupResultProcessor) (void *cls, | 85 | typedef void (*GNUNET_GNS_LookupResultProcessor) (void *cls, |
86 | uint32_t rd_count, | 86 | uint32_t rd_count, |
87 | const struct GNUNET_NAMESTORE_RecordData *rd); | 87 | const struct GNUNET_GNSRECORD_Data *rd); |
88 | 88 | ||
89 | 89 | ||
90 | /** | 90 | /** |
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h index aefdeb4a4..96e7e3aee 100644 --- a/src/include/gnunet_gnsrecord_lib.h +++ b/src/include/gnunet_gnsrecord_lib.h | |||
@@ -37,7 +37,7 @@ extern "C" | |||
37 | /** | 37 | /** |
38 | * Maximum size of a value that can be stored in a GNS block. | 38 | * Maximum size of a value that can be stored in a GNS block. |
39 | */ | 39 | */ |
40 | #define GNUNET_NAMESTORE_MAX_VALUE_SIZE (63 * 1024) | 40 | #define GNUNET_GNSRECORD_MAX_BLOCK_SIZE (63 * 1024) |
41 | 41 | ||
42 | 42 | ||
43 | /** | 43 | /** |
@@ -84,37 +84,37 @@ extern "C" | |||
84 | /** | 84 | /** |
85 | * Flags that can be set for a record. | 85 | * Flags that can be set for a record. |
86 | */ | 86 | */ |
87 | enum GNUNET_NAMESTORE_RecordFlags | 87 | enum GNUNET_GNSRECORD_Flags |
88 | { | 88 | { |
89 | 89 | ||
90 | /** | 90 | /** |
91 | * No special options. | 91 | * No special options. |
92 | */ | 92 | */ |
93 | GNUNET_NAMESTORE_RF_NONE = 0, | 93 | GNUNET_GNSRECORD_RF_NONE = 0, |
94 | 94 | ||
95 | /** | 95 | /** |
96 | * This is a private record of this peer and it should | 96 | * This is a private record of this peer and it should |
97 | * thus not be handed out to other peers. | 97 | * thus not be handed out to other peers. |
98 | */ | 98 | */ |
99 | GNUNET_NAMESTORE_RF_PRIVATE = 2, | 99 | GNUNET_GNSRECORD_RF_PRIVATE = 2, |
100 | 100 | ||
101 | /** | 101 | /** |
102 | * This record was added automatically by the system | 102 | * This record was added automatically by the system |
103 | * and is pending user confimation. | 103 | * and is pending user confimation. |
104 | */ | 104 | */ |
105 | GNUNET_NAMESTORE_RF_PENDING = 4, | 105 | GNUNET_GNSRECORD_RF_PENDING = 4, |
106 | 106 | ||
107 | /** | 107 | /** |
108 | * This expiration time of the record is a relative | 108 | * This expiration time of the record is a relative |
109 | * time (not an absolute time). | 109 | * time (not an absolute time). |
110 | */ | 110 | */ |
111 | GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION = 8, | 111 | GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION = 8, |
112 | 112 | ||
113 | /** | 113 | /** |
114 | * This record should not be used unless all (other) records with an absolute | 114 | * This record should not be used unless all (other) records with an absolute |
115 | * expiration time have expired. | 115 | * expiration time have expired. |
116 | */ | 116 | */ |
117 | GNUNET_NAMESTORE_RF_SHADOW_RECORD = 16 | 117 | GNUNET_GNSRECORD_RF_SHADOW_RECORD = 16 |
118 | 118 | ||
119 | /** | 119 | /** |
120 | * When comparing flags for record equality for removal, | 120 | * When comparing flags for record equality for removal, |
@@ -125,16 +125,16 @@ enum GNUNET_NAMESTORE_RecordFlags | |||
125 | * pass the '--private' option when removing a record from | 125 | * pass the '--private' option when removing a record from |
126 | * the namestore, hence we don't require this particular option | 126 | * the namestore, hence we don't require this particular option |
127 | * to match upon removal). See also | 127 | * to match upon removal). See also |
128 | * #GNUNET_NAMESTORE_records_cmp. | 128 | * #GNUNET_GNSRECORD_records_cmp. |
129 | */ | 129 | */ |
130 | #define GNUNET_NAMESTORE_RF_RCMP_FLAGS (GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION) | 130 | #define GNUNET_GNSRECORD_RF_RCMP_FLAGS (GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION) |
131 | }; | 131 | }; |
132 | 132 | ||
133 | 133 | ||
134 | /** | 134 | /** |
135 | * A GNS record. | 135 | * A GNS record. |
136 | */ | 136 | */ |
137 | struct GNUNET_NAMESTORE_RecordData | 137 | struct GNUNET_GNSRECORD_Data |
138 | { | 138 | { |
139 | 139 | ||
140 | /** | 140 | /** |
@@ -164,7 +164,7 @@ struct GNUNET_NAMESTORE_RecordData | |||
164 | /** | 164 | /** |
165 | * Flags for the record. | 165 | * Flags for the record. |
166 | */ | 166 | */ |
167 | enum GNUNET_NAMESTORE_RecordFlags flags; | 167 | enum GNUNET_GNSRECORD_Flags flags; |
168 | }; | 168 | }; |
169 | 169 | ||
170 | 170 | ||
@@ -175,7 +175,7 @@ GNUNET_NETWORK_STRUCT_BEGIN | |||
175 | /** | 175 | /** |
176 | * Information we have in an encrypted block with record data (i.e. in the DHT). | 176 | * Information we have in an encrypted block with record data (i.e. in the DHT). |
177 | */ | 177 | */ |
178 | struct GNUNET_NAMESTORE_Block | 178 | struct GNUNET_GNSRECORD_Block |
179 | { | 179 | { |
180 | 180 | ||
181 | /** | 181 | /** |
@@ -212,9 +212,9 @@ GNUNET_NETWORK_STRUCT_END | |||
212 | * @param rd_count number of entries in @a rd array | 212 | * @param rd_count number of entries in @a rd array |
213 | * @param rd array of records with data to store | 213 | * @param rd array of records with data to store |
214 | */ | 214 | */ |
215 | typedef void (*GNUNET_NAMESTORE_RecordCallback) (void *cls, | 215 | typedef void (*GNUNET_GNSRECORD_RecordCallback) (void *cls, |
216 | unsigned int rd_count, | 216 | unsigned int rd_count, |
217 | const struct GNUNET_NAMESTORE_RecordData *rd); | 217 | const struct GNUNET_GNSRECORD_Data *rd); |
218 | 218 | ||
219 | 219 | ||
220 | 220 | ||
@@ -279,26 +279,26 @@ GNUNET_GNSRECORD_number_to_typename (uint32_t type); | |||
279 | * records. | 279 | * records. |
280 | * | 280 | * |
281 | * @param rd_count number of records in the @a rd array | 281 | * @param rd_count number of records in the @a rd array |
282 | * @param rd array of #GNUNET_NAMESTORE_RecordData with @a rd_count elements | 282 | * @param rd array of #GNUNET_GNSRECORD_Data with @a rd_count elements |
283 | * @return the required size to serialize | 283 | * @return the required size to serialize |
284 | */ | 284 | */ |
285 | size_t | 285 | size_t |
286 | GNUNET_NAMESTORE_records_get_size (unsigned int rd_count, | 286 | GNUNET_GNSRECORD_records_get_size (unsigned int rd_count, |
287 | const struct GNUNET_NAMESTORE_RecordData *rd); | 287 | const struct GNUNET_GNSRECORD_Data *rd); |
288 | 288 | ||
289 | 289 | ||
290 | /** | 290 | /** |
291 | * Serialize the given records to the given destination buffer. | 291 | * Serialize the given records to the given destination buffer. |
292 | * | 292 | * |
293 | * @param rd_count number of records in the @a rd array | 293 | * @param rd_count number of records in the @a rd array |
294 | * @param rd array of #GNUNET_NAMESTORE_RecordData with @a rd_count elements | 294 | * @param rd array of #GNUNET_GNSRECORD_Data with @a rd_count elements |
295 | * @param dest_size size of the destination array @a dst | 295 | * @param dest_size size of the destination array @a dst |
296 | * @param dest where to write the result | 296 | * @param dest where to write the result |
297 | * @return the size of serialized records, -1 if records do not fit | 297 | * @return the size of serialized records, -1 if records do not fit |
298 | */ | 298 | */ |
299 | ssize_t | 299 | ssize_t |
300 | GNUNET_NAMESTORE_records_serialize (unsigned int rd_count, | 300 | GNUNET_GNSRECORD_records_serialize (unsigned int rd_count, |
301 | const struct GNUNET_NAMESTORE_RecordData *rd, | 301 | const struct GNUNET_GNSRECORD_Data *rd, |
302 | size_t dest_size, | 302 | size_t dest_size, |
303 | char *dest); | 303 | char *dest); |
304 | 304 | ||
@@ -313,10 +313,10 @@ GNUNET_NAMESTORE_records_serialize (unsigned int rd_count, | |||
313 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error | 313 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error |
314 | */ | 314 | */ |
315 | int | 315 | int |
316 | GNUNET_NAMESTORE_records_deserialize (size_t len, | 316 | GNUNET_GNSRECORD_records_deserialize (size_t len, |
317 | const char *src, | 317 | const char *src, |
318 | unsigned int rd_count, | 318 | unsigned int rd_count, |
319 | struct GNUNET_NAMESTORE_RecordData *dest); | 319 | struct GNUNET_GNSRECORD_Data *dest); |
320 | 320 | ||
321 | 321 | ||
322 | /* ******* general APIs relating to blocks, records and labels ******** */ | 322 | /* ******* general APIs relating to blocks, records and labels ******** */ |
@@ -331,7 +331,7 @@ GNUNET_NAMESTORE_records_deserialize (size_t len, | |||
331 | * #GNUNET_NO if not | 331 | * #GNUNET_NO if not |
332 | */ | 332 | */ |
333 | int | 333 | int |
334 | GNUNET_NAMESTORE_is_expired (const struct GNUNET_NAMESTORE_RecordData *rd); | 334 | GNUNET_GNSRECORD_is_expired (const struct GNUNET_GNSRECORD_Data *rd); |
335 | 335 | ||
336 | 336 | ||
337 | /** | 337 | /** |
@@ -340,7 +340,7 @@ GNUNET_NAMESTORE_is_expired (const struct GNUNET_NAMESTORE_RecordData *rd); | |||
340 | * @return converted result | 340 | * @return converted result |
341 | */ | 341 | */ |
342 | char * | 342 | char * |
343 | GNUNET_NAMESTORE_normalize_string (const char *src); | 343 | GNUNET_GNSRECORD_string_to_lowercase (const char *src); |
344 | 344 | ||
345 | 345 | ||
346 | /** | 346 | /** |
@@ -349,10 +349,10 @@ GNUNET_NAMESTORE_normalize_string (const char *src); | |||
349 | * NOT reentrant! | 349 | * NOT reentrant! |
350 | * | 350 | * |
351 | * @param z public key of a zone | 351 | * @param z public key of a zone |
352 | * @return string form; will be overwritten by next call to #GNUNET_NAMESTORE_z2s. | 352 | * @return string form; will be overwritten by next call to #GNUNET_GNSRECORD_z2s. |
353 | */ | 353 | */ |
354 | const char * | 354 | const char * |
355 | GNUNET_NAMESTORE_z2s (const struct GNUNET_CRYPTO_EcdsaPublicKey *z); | 355 | GNUNET_GNSRECORD_z2s (const struct GNUNET_CRYPTO_EcdsaPublicKey *z); |
356 | 356 | ||
357 | 357 | ||
358 | /** | 358 | /** |
@@ -366,7 +366,7 @@ GNUNET_NAMESTORE_z2s (const struct GNUNET_CRYPTO_EcdsaPublicKey *z); | |||
366 | * key in an encoding suitable for DNS labels. | 366 | * key in an encoding suitable for DNS labels. |
367 | */ | 367 | */ |
368 | const char * | 368 | const char * |
369 | GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey); | 369 | GNUNET_GNSRECORD_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey); |
370 | 370 | ||
371 | 371 | ||
372 | /** | 372 | /** |
@@ -379,7 +379,7 @@ GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey); | |||
379 | * @return #GNUNET_SYSERR if @a zkey has the wrong syntax | 379 | * @return #GNUNET_SYSERR if @a zkey has the wrong syntax |
380 | */ | 380 | */ |
381 | int | 381 | int |
382 | GNUNET_NAMESTORE_zkey_to_pkey (const char *zkey, | 382 | GNUNET_GNSRECORD_zkey_to_pkey (const char *zkey, |
383 | struct GNUNET_CRYPTO_EcdsaPublicKey *pkey); | 383 | struct GNUNET_CRYPTO_EcdsaPublicKey *pkey); |
384 | 384 | ||
385 | 385 | ||
@@ -391,7 +391,7 @@ GNUNET_NAMESTORE_zkey_to_pkey (const char *zkey, | |||
391 | * @param query hash to use for the query | 391 | * @param query hash to use for the query |
392 | */ | 392 | */ |
393 | void | 393 | void |
394 | GNUNET_NAMESTORE_query_from_private_key (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 394 | GNUNET_GNSRECORD_query_from_private_key (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, |
395 | const char *label, | 395 | const char *label, |
396 | struct GNUNET_HashCode *query); | 396 | struct GNUNET_HashCode *query); |
397 | 397 | ||
@@ -404,7 +404,7 @@ GNUNET_NAMESTORE_query_from_private_key (const struct GNUNET_CRYPTO_EcdsaPrivate | |||
404 | * @param query hash to use for the query | 404 | * @param query hash to use for the query |
405 | */ | 405 | */ |
406 | void | 406 | void |
407 | GNUNET_NAMESTORE_query_from_public_key (const struct GNUNET_CRYPTO_EcdsaPublicKey *pub, | 407 | GNUNET_GNSRECORD_query_from_public_key (const struct GNUNET_CRYPTO_EcdsaPublicKey *pub, |
408 | const char *label, | 408 | const char *label, |
409 | struct GNUNET_HashCode *query); | 409 | struct GNUNET_HashCode *query); |
410 | 410 | ||
@@ -418,11 +418,11 @@ GNUNET_NAMESTORE_query_from_public_key (const struct GNUNET_CRYPTO_EcdsaPublicKe | |||
418 | * @param rd record data | 418 | * @param rd record data |
419 | * @param rd_count number of records in @a rd | 419 | * @param rd_count number of records in @a rd |
420 | */ | 420 | */ |
421 | struct GNUNET_NAMESTORE_Block * | 421 | struct GNUNET_GNSRECORD_Block * |
422 | GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, | 422 | GNUNET_GNSRECORD_block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, |
423 | struct GNUNET_TIME_Absolute expire, | 423 | struct GNUNET_TIME_Absolute expire, |
424 | const char *label, | 424 | const char *label, |
425 | const struct GNUNET_NAMESTORE_RecordData *rd, | 425 | const struct GNUNET_GNSRECORD_Data *rd, |
426 | unsigned int rd_count); | 426 | unsigned int rd_count); |
427 | 427 | ||
428 | 428 | ||
@@ -434,7 +434,7 @@ GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, | |||
434 | * @return #GNUNET_OK if the signature is valid | 434 | * @return #GNUNET_OK if the signature is valid |
435 | */ | 435 | */ |
436 | int | 436 | int |
437 | GNUNET_NAMESTORE_block_verify (const struct GNUNET_NAMESTORE_Block *block); | 437 | GNUNET_GNSRECORD_block_verify (const struct GNUNET_GNSRECORD_Block *block); |
438 | 438 | ||
439 | 439 | ||
440 | /** | 440 | /** |
@@ -449,10 +449,10 @@ GNUNET_NAMESTORE_block_verify (const struct GNUNET_NAMESTORE_Block *block); | |||
449 | * not well-formed | 449 | * not well-formed |
450 | */ | 450 | */ |
451 | int | 451 | int |
452 | GNUNET_NAMESTORE_block_decrypt (const struct GNUNET_NAMESTORE_Block *block, | 452 | GNUNET_GNSRECORD_block_decrypt (const struct GNUNET_GNSRECORD_Block *block, |
453 | const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key, | 453 | const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key, |
454 | const char *label, | 454 | const char *label, |
455 | GNUNET_NAMESTORE_RecordCallback proc, | 455 | GNUNET_GNSRECORD_RecordCallback proc, |
456 | void *proc_cls); | 456 | void *proc_cls); |
457 | 457 | ||
458 | 458 | ||
@@ -464,8 +464,8 @@ GNUNET_NAMESTORE_block_decrypt (const struct GNUNET_NAMESTORE_Block *block, | |||
464 | * @return #GNUNET_YES if the records are equal, or #GNUNET_NO if not. | 464 | * @return #GNUNET_YES if the records are equal, or #GNUNET_NO if not. |
465 | */ | 465 | */ |
466 | int | 466 | int |
467 | GNUNET_NAMESTORE_records_cmp (const struct GNUNET_NAMESTORE_RecordData *a, | 467 | GNUNET_GNSRECORD_records_cmp (const struct GNUNET_GNSRECORD_Data *a, |
468 | const struct GNUNET_NAMESTORE_RecordData *b); | 468 | const struct GNUNET_GNSRECORD_Data *b); |
469 | 469 | ||
470 | 470 | ||
471 | /** | 471 | /** |
@@ -478,8 +478,8 @@ GNUNET_NAMESTORE_records_cmp (const struct GNUNET_NAMESTORE_RecordData *a, | |||
478 | * @return absolute expiration time | 478 | * @return absolute expiration time |
479 | */ | 479 | */ |
480 | struct GNUNET_TIME_Absolute | 480 | struct GNUNET_TIME_Absolute |
481 | GNUNET_NAMESTORE_record_get_expiration_time (unsigned int rd_count, | 481 | GNUNET_GNSRECORD_record_get_expiration_time (unsigned int rd_count, |
482 | const struct GNUNET_NAMESTORE_RecordData *rd); | 482 | const struct GNUNET_GNSRECORD_Data *rd); |
483 | 483 | ||
484 | 484 | ||
485 | 485 | ||
diff --git a/src/include/gnunet_namecache_plugin.h b/src/include/gnunet_namecache_plugin.h index 0955d110c..408b8a699 100644 --- a/src/include/gnunet_namecache_plugin.h +++ b/src/include/gnunet_namecache_plugin.h | |||
@@ -46,7 +46,7 @@ extern "C" | |||
46 | * @param block lookup result | 46 | * @param block lookup result |
47 | */ | 47 | */ |
48 | typedef void (*GNUNET_NAMECACHE_BlockCallback) (void *cls, | 48 | typedef void (*GNUNET_NAMECACHE_BlockCallback) (void *cls, |
49 | const struct GNUNET_NAMESTORE_Block *block); | 49 | const struct GNUNET_GNSRECORD_Block *block); |
50 | 50 | ||
51 | 51 | ||
52 | /** | 52 | /** |
@@ -69,7 +69,7 @@ struct GNUNET_NAMECACHE_PluginFunctions | |||
69 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 69 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
70 | */ | 70 | */ |
71 | int (*cache_block) (void *cls, | 71 | int (*cache_block) (void *cls, |
72 | const struct GNUNET_NAMESTORE_Block *block); | 72 | const struct GNUNET_GNSRECORD_Block *block); |
73 | 73 | ||
74 | 74 | ||
75 | /** | 75 | /** |
diff --git a/src/include/gnunet_namecache_service.h b/src/include/gnunet_namecache_service.h index 1a71f1ebd..e244d51a4 100644 --- a/src/include/gnunet_namecache_service.h +++ b/src/include/gnunet_namecache_service.h | |||
@@ -107,7 +107,7 @@ typedef void (*GNUNET_NAMECACHE_ContinuationWithStatus) (void *cls, | |||
107 | */ | 107 | */ |
108 | struct GNUNET_NAMECACHE_QueueEntry * | 108 | struct GNUNET_NAMECACHE_QueueEntry * |
109 | GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h, | 109 | GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h, |
110 | const struct GNUNET_NAMESTORE_Block *block, | 110 | const struct GNUNET_GNSRECORD_Block *block, |
111 | GNUNET_NAMECACHE_ContinuationWithStatus cont, | 111 | GNUNET_NAMECACHE_ContinuationWithStatus cont, |
112 | void *cont_cls); | 112 | void *cont_cls); |
113 | 113 | ||
@@ -119,7 +119,7 @@ GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h, | |||
119 | * @param block block that was stored in the namecache | 119 | * @param block block that was stored in the namecache |
120 | */ | 120 | */ |
121 | typedef void (*GNUNET_NAMECACHE_BlockProcessor) (void *cls, | 121 | typedef void (*GNUNET_NAMECACHE_BlockProcessor) (void *cls, |
122 | const struct GNUNET_NAMESTORE_Block *block); | 122 | const struct GNUNET_GNSRECORD_Block *block); |
123 | 123 | ||
124 | 124 | ||
125 | /** | 125 | /** |
diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h index 5c7408eec..037c6927a 100644 --- a/src/include/gnunet_namestore_plugin.h +++ b/src/include/gnunet_namestore_plugin.h | |||
@@ -44,8 +44,8 @@ extern "C" | |||
44 | * @param cls closure | 44 | * @param cls closure |
45 | * @param block lookup result | 45 | * @param block lookup result |
46 | */ | 46 | */ |
47 | typedef void (*GNUNET_NAMESTORE_BlockCallback) (void *cls, | 47 | typedef void (*GNUNET_GNSRECORD_BlockCallback) (void *cls, |
48 | const struct GNUNET_NAMESTORE_Block *block); | 48 | const struct GNUNET_GNSRECORD_Block *block); |
49 | 49 | ||
50 | 50 | ||
51 | /** | 51 | /** |
@@ -61,7 +61,7 @@ typedef void (*GNUNET_NAMESTORE_RecordIterator) (void *cls, | |||
61 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *private_key, | 61 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *private_key, |
62 | const char *label, | 62 | const char *label, |
63 | unsigned int rd_count, | 63 | unsigned int rd_count, |
64 | const struct GNUNET_NAMESTORE_RecordData *rd); | 64 | const struct GNUNET_GNSRECORD_Data *rd); |
65 | 65 | ||
66 | 66 | ||
67 | /** | 67 | /** |
@@ -84,7 +84,7 @@ struct GNUNET_NAMESTORE_PluginFunctions | |||
84 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 84 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
85 | */ | 85 | */ |
86 | int (*cache_block) (void *cls, | 86 | int (*cache_block) (void *cls, |
87 | const struct GNUNET_NAMESTORE_Block *block); | 87 | const struct GNUNET_GNSRECORD_Block *block); |
88 | 88 | ||
89 | 89 | ||
90 | /** | 90 | /** |
@@ -99,7 +99,7 @@ struct GNUNET_NAMESTORE_PluginFunctions | |||
99 | */ | 99 | */ |
100 | int (*lookup_block) (void *cls, | 100 | int (*lookup_block) (void *cls, |
101 | const struct GNUNET_HashCode *query, | 101 | const struct GNUNET_HashCode *query, |
102 | GNUNET_NAMESTORE_BlockCallback iter, void *iter_cls); | 102 | GNUNET_GNSRECORD_BlockCallback iter, void *iter_cls); |
103 | 103 | ||
104 | 104 | ||
105 | 105 | ||
@@ -118,7 +118,7 @@ struct GNUNET_NAMESTORE_PluginFunctions | |||
118 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 118 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, |
119 | const char *label, | 119 | const char *label, |
120 | unsigned int rd_count, | 120 | unsigned int rd_count, |
121 | const struct GNUNET_NAMESTORE_RecordData *rd); | 121 | const struct GNUNET_GNSRECORD_Data *rd); |
122 | 122 | ||
123 | 123 | ||
124 | /** | 124 | /** |
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h index 30098832c..b37cecf50 100644 --- a/src/include/gnunet_namestore_service.h +++ b/src/include/gnunet_namestore_service.h | |||
@@ -106,7 +106,7 @@ typedef void (*GNUNET_NAMESTORE_ContinuationWithStatus) (void *cls, | |||
106 | */ | 106 | */ |
107 | struct GNUNET_NAMESTORE_QueueEntry * | 107 | struct GNUNET_NAMESTORE_QueueEntry * |
108 | GNUNET_NAMESTORE_block_cache (struct GNUNET_NAMESTORE_Handle *h, | 108 | GNUNET_NAMESTORE_block_cache (struct GNUNET_NAMESTORE_Handle *h, |
109 | const struct GNUNET_NAMESTORE_Block *block, | 109 | const struct GNUNET_GNSRECORD_Block *block, |
110 | GNUNET_NAMESTORE_ContinuationWithStatus cont, | 110 | GNUNET_NAMESTORE_ContinuationWithStatus cont, |
111 | void *cont_cls); | 111 | void *cont_cls); |
112 | 112 | ||
@@ -130,7 +130,7 @@ GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h, | |||
130 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, | 130 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, |
131 | const char *label, | 131 | const char *label, |
132 | unsigned int rd_count, | 132 | unsigned int rd_count, |
133 | const struct GNUNET_NAMESTORE_RecordData *rd, | 133 | const struct GNUNET_GNSRECORD_Data *rd, |
134 | GNUNET_NAMESTORE_ContinuationWithStatus cont, | 134 | GNUNET_NAMESTORE_ContinuationWithStatus cont, |
135 | void *cont_cls); | 135 | void *cont_cls); |
136 | 136 | ||
@@ -141,8 +141,8 @@ GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h, | |||
141 | * @param cls closure | 141 | * @param cls closure |
142 | * @param block block that was stored in the namestore | 142 | * @param block block that was stored in the namestore |
143 | */ | 143 | */ |
144 | typedef void (*GNUNET_NAMESTORE_BlockProcessor) (void *cls, | 144 | typedef void (*GNUNET_GNSRECORD_BlockProcessor) (void *cls, |
145 | const struct GNUNET_NAMESTORE_Block *block); | 145 | const struct GNUNET_GNSRECORD_Block *block); |
146 | 146 | ||
147 | 147 | ||
148 | /** | 148 | /** |
@@ -160,7 +160,7 @@ typedef void (*GNUNET_NAMESTORE_BlockProcessor) (void *cls, | |||
160 | struct GNUNET_NAMESTORE_QueueEntry * | 160 | struct GNUNET_NAMESTORE_QueueEntry * |
161 | GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h, | 161 | GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h, |
162 | const struct GNUNET_HashCode *derived_hash, | 162 | const struct GNUNET_HashCode *derived_hash, |
163 | GNUNET_NAMESTORE_BlockProcessor proc, void *proc_cls); | 163 | GNUNET_GNSRECORD_BlockProcessor proc, void *proc_cls); |
164 | 164 | ||
165 | 165 | ||
166 | /** | 166 | /** |
@@ -176,7 +176,7 @@ typedef void (*GNUNET_NAMESTORE_RecordMonitor) (void *cls, | |||
176 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 176 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, |
177 | const char *label, | 177 | const char *label, |
178 | unsigned int rd_count, | 178 | unsigned int rd_count, |
179 | const struct GNUNET_NAMESTORE_RecordData *rd); | 179 | const struct GNUNET_GNSRECORD_Data *rd); |
180 | 180 | ||
181 | 181 | ||
182 | /** | 182 | /** |