diff options
Diffstat (limited to 'src/util/pseudonym.c')
-rw-r--r-- | src/util/pseudonym.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c index 016573845..c3964f296 100644 --- a/src/util/pseudonym.c +++ b/src/util/pseudonym.c | |||
@@ -88,7 +88,7 @@ static struct DiscoveryCallback *head; | |||
88 | * @param rating rating of pseudonym | 88 | * @param rating rating of pseudonym |
89 | */ | 89 | */ |
90 | static void | 90 | static void |
91 | internal_notify (const GNUNET_HashCode * id, | 91 | internal_notify (const struct GNUNET_HashCode * id, |
92 | const struct GNUNET_CONTAINER_MetaData *md, int rating) | 92 | const struct GNUNET_CONTAINER_MetaData *md, int rating) |
93 | { | 93 | { |
94 | struct DiscoveryCallback *pos; | 94 | struct DiscoveryCallback *pos; |
@@ -169,7 +169,7 @@ GNUNET_PSEUDONYM_discovery_callback_unregister (GNUNET_PSEUDONYM_Iterator | |||
169 | */ | 169 | */ |
170 | static char * | 170 | static char * |
171 | get_data_filename (const struct GNUNET_CONFIGURATION_Handle *cfg, | 171 | get_data_filename (const struct GNUNET_CONFIGURATION_Handle *cfg, |
172 | const char *prefix, const GNUNET_HashCode * psid) | 172 | const char *prefix, const struct GNUNET_HashCode * psid) |
173 | { | 173 | { |
174 | struct GNUNET_CRYPTO_HashAsciiEncoded enc; | 174 | struct GNUNET_CRYPTO_HashAsciiEncoded enc; |
175 | 175 | ||
@@ -192,7 +192,7 @@ get_data_filename (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
192 | */ | 192 | */ |
193 | static void | 193 | static void |
194 | write_pseudonym_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | 194 | write_pseudonym_info (const struct GNUNET_CONFIGURATION_Handle *cfg, |
195 | const GNUNET_HashCode * nsid, | 195 | const struct GNUNET_HashCode * nsid, |
196 | const struct GNUNET_CONTAINER_MetaData *meta, | 196 | const struct GNUNET_CONTAINER_MetaData *meta, |
197 | int32_t ranking, const char *ns_name) | 197 | int32_t ranking, const char *ns_name) |
198 | { | 198 | { |
@@ -238,7 +238,7 @@ write_pseudonym_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
238 | */ | 238 | */ |
239 | static int | 239 | static int |
240 | read_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | 240 | read_info (const struct GNUNET_CONFIGURATION_Handle *cfg, |
241 | const GNUNET_HashCode * nsid, | 241 | const struct GNUNET_HashCode * nsid, |
242 | struct GNUNET_CONTAINER_MetaData **meta, int32_t * ranking, | 242 | struct GNUNET_CONTAINER_MetaData **meta, int32_t * ranking, |
243 | char **ns_name) | 243 | char **ns_name) |
244 | { | 244 | { |
@@ -303,9 +303,9 @@ read_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
303 | */ | 303 | */ |
304 | char * | 304 | char * |
305 | GNUNET_PSEUDONYM_name_uniquify (const struct GNUNET_CONFIGURATION_Handle *cfg, | 305 | GNUNET_PSEUDONYM_name_uniquify (const struct GNUNET_CONFIGURATION_Handle *cfg, |
306 | const GNUNET_HashCode * nsid, const char *name, unsigned int *suffix) | 306 | const struct GNUNET_HashCode * nsid, const char *name, unsigned int *suffix) |
307 | { | 307 | { |
308 | GNUNET_HashCode nh; | 308 | struct GNUNET_HashCode nh; |
309 | uint64_t len; | 309 | uint64_t len; |
310 | char *fn; | 310 | char *fn; |
311 | struct GNUNET_DISK_FileHandle *fh; | 311 | struct GNUNET_DISK_FileHandle *fh; |
@@ -328,23 +328,23 @@ GNUNET_PSEUDONYM_name_uniquify (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
328 | GNUNET_DISK_PERM_USER_WRITE); | 328 | GNUNET_DISK_PERM_USER_WRITE); |
329 | i = 0; | 329 | i = 0; |
330 | idx = -1; | 330 | idx = -1; |
331 | while ((len >= sizeof (GNUNET_HashCode)) && | 331 | while ((len >= sizeof (struct GNUNET_HashCode)) && |
332 | (sizeof (GNUNET_HashCode) == | 332 | (sizeof (struct GNUNET_HashCode) == |
333 | GNUNET_DISK_file_read (fh, &nh, sizeof (GNUNET_HashCode)))) | 333 | GNUNET_DISK_file_read (fh, &nh, sizeof (struct GNUNET_HashCode)))) |
334 | { | 334 | { |
335 | if (0 == memcmp (&nh, nsid, sizeof (GNUNET_HashCode))) | 335 | if (0 == memcmp (&nh, nsid, sizeof (struct GNUNET_HashCode))) |
336 | { | 336 | { |
337 | idx = i; | 337 | idx = i; |
338 | break; | 338 | break; |
339 | } | 339 | } |
340 | i++; | 340 | i++; |
341 | len -= sizeof (GNUNET_HashCode); | 341 | len -= sizeof (struct GNUNET_HashCode); |
342 | } | 342 | } |
343 | if (idx == -1) | 343 | if (idx == -1) |
344 | { | 344 | { |
345 | idx = i; | 345 | idx = i; |
346 | if (sizeof (GNUNET_HashCode) != | 346 | if (sizeof (struct GNUNET_HashCode) != |
347 | GNUNET_DISK_file_write (fh, nsid, sizeof (GNUNET_HashCode))) | 347 | GNUNET_DISK_file_write (fh, nsid, sizeof (struct GNUNET_HashCode))) |
348 | LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "write", fn); | 348 | LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "write", fn); |
349 | } | 349 | } |
350 | GNUNET_DISK_file_close (fh); | 350 | GNUNET_DISK_file_close (fh); |
@@ -376,7 +376,7 @@ GNUNET_PSEUDONYM_name_uniquify (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
376 | */ | 376 | */ |
377 | int | 377 | int |
378 | GNUNET_PSEUDONYM_get_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | 378 | GNUNET_PSEUDONYM_get_info (const struct GNUNET_CONFIGURATION_Handle *cfg, |
379 | const GNUNET_HashCode * nsid, struct GNUNET_CONTAINER_MetaData **ret_meta, | 379 | const struct GNUNET_HashCode * nsid, struct GNUNET_CONTAINER_MetaData **ret_meta, |
380 | int32_t *ret_rank, char **ret_name, int *name_is_a_dup) | 380 | int32_t *ret_rank, char **ret_name, int *name_is_a_dup) |
381 | { | 381 | { |
382 | struct GNUNET_CONTAINER_MetaData *meta; | 382 | struct GNUNET_CONTAINER_MetaData *meta; |
@@ -450,13 +450,13 @@ GNUNET_PSEUDONYM_get_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
450 | */ | 450 | */ |
451 | int | 451 | int |
452 | GNUNET_PSEUDONYM_name_to_id (const struct GNUNET_CONFIGURATION_Handle *cfg, | 452 | GNUNET_PSEUDONYM_name_to_id (const struct GNUNET_CONFIGURATION_Handle *cfg, |
453 | const char *ns_uname, GNUNET_HashCode * nsid) | 453 | const char *ns_uname, struct GNUNET_HashCode * nsid) |
454 | { | 454 | { |
455 | size_t slen; | 455 | size_t slen; |
456 | uint64_t len; | 456 | uint64_t len; |
457 | unsigned int idx; | 457 | unsigned int idx; |
458 | char *name; | 458 | char *name; |
459 | GNUNET_HashCode nh; | 459 | struct GNUNET_HashCode nh; |
460 | char *fn; | 460 | char *fn; |
461 | struct GNUNET_DISK_FileHandle *fh; | 461 | struct GNUNET_DISK_FileHandle *fh; |
462 | 462 | ||
@@ -476,7 +476,7 @@ GNUNET_PSEUDONYM_name_to_id (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
476 | 476 | ||
477 | if ((GNUNET_OK != GNUNET_DISK_file_test (fn) || | 477 | if ((GNUNET_OK != GNUNET_DISK_file_test (fn) || |
478 | (GNUNET_OK != GNUNET_DISK_file_size (fn, &len, GNUNET_YES, GNUNET_YES))) || | 478 | (GNUNET_OK != GNUNET_DISK_file_size (fn, &len, GNUNET_YES, GNUNET_YES))) || |
479 | ((idx + 1) * sizeof (GNUNET_HashCode) > len)) | 479 | ((idx + 1) * sizeof (struct GNUNET_HashCode) > len)) |
480 | { | 480 | { |
481 | GNUNET_free (fn); | 481 | GNUNET_free (fn); |
482 | return GNUNET_SYSERR; | 482 | return GNUNET_SYSERR; |
@@ -487,10 +487,10 @@ GNUNET_PSEUDONYM_name_to_id (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
487 | GNUNET_DISK_PERM_USER_READ | | 487 | GNUNET_DISK_PERM_USER_READ | |
488 | GNUNET_DISK_PERM_USER_WRITE); | 488 | GNUNET_DISK_PERM_USER_WRITE); |
489 | GNUNET_free (fn); | 489 | GNUNET_free (fn); |
490 | GNUNET_DISK_file_seek (fh, idx * sizeof (GNUNET_HashCode), | 490 | GNUNET_DISK_file_seek (fh, idx * sizeof (struct GNUNET_HashCode), |
491 | GNUNET_DISK_SEEK_SET); | 491 | GNUNET_DISK_SEEK_SET); |
492 | if (sizeof (GNUNET_HashCode) != | 492 | if (sizeof (struct GNUNET_HashCode) != |
493 | GNUNET_DISK_file_read (fh, nsid, sizeof (GNUNET_HashCode))) | 493 | GNUNET_DISK_file_read (fh, nsid, sizeof (struct GNUNET_HashCode))) |
494 | { | 494 | { |
495 | GNUNET_DISK_file_close (fh); | 495 | GNUNET_DISK_file_close (fh); |
496 | return GNUNET_SYSERR; | 496 | return GNUNET_SYSERR; |
@@ -535,7 +535,7 @@ list_pseudonym_helper (void *cls, const char *fullname) | |||
535 | { | 535 | { |
536 | struct ListPseudonymClosure *c = cls; | 536 | struct ListPseudonymClosure *c = cls; |
537 | int ret; | 537 | int ret; |
538 | GNUNET_HashCode id; | 538 | struct GNUNET_HashCode id; |
539 | int32_t rating; | 539 | int32_t rating; |
540 | struct GNUNET_CONTAINER_MetaData *meta; | 540 | struct GNUNET_CONTAINER_MetaData *meta; |
541 | const char *fn; | 541 | const char *fn; |
@@ -612,7 +612,7 @@ GNUNET_PSEUDONYM_list_all (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
612 | */ | 612 | */ |
613 | int | 613 | int |
614 | GNUNET_PSEUDONYM_rank (const struct GNUNET_CONFIGURATION_Handle *cfg, | 614 | GNUNET_PSEUDONYM_rank (const struct GNUNET_CONFIGURATION_Handle *cfg, |
615 | const GNUNET_HashCode * nsid, int delta) | 615 | const struct GNUNET_HashCode * nsid, int delta) |
616 | { | 616 | { |
617 | struct GNUNET_CONTAINER_MetaData *meta; | 617 | struct GNUNET_CONTAINER_MetaData *meta; |
618 | int ret; | 618 | int ret; |
@@ -648,7 +648,7 @@ GNUNET_PSEUDONYM_rank (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
648 | */ | 648 | */ |
649 | int | 649 | int |
650 | GNUNET_PSEUDONYM_set_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | 650 | GNUNET_PSEUDONYM_set_info (const struct GNUNET_CONFIGURATION_Handle *cfg, |
651 | const GNUNET_HashCode * nsid, const char *name, | 651 | const struct GNUNET_HashCode * nsid, const char *name, |
652 | const struct GNUNET_CONTAINER_MetaData *md, int rank) | 652 | const struct GNUNET_CONTAINER_MetaData *md, int rank) |
653 | { | 653 | { |
654 | GNUNET_assert (cfg != NULL); | 654 | GNUNET_assert (cfg != NULL); |
@@ -670,7 +670,7 @@ GNUNET_PSEUDONYM_set_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
670 | */ | 670 | */ |
671 | void | 671 | void |
672 | GNUNET_PSEUDONYM_add (const struct GNUNET_CONFIGURATION_Handle *cfg, | 672 | GNUNET_PSEUDONYM_add (const struct GNUNET_CONFIGURATION_Handle *cfg, |
673 | const GNUNET_HashCode * id, | 673 | const struct GNUNET_HashCode * id, |
674 | const struct GNUNET_CONTAINER_MetaData *meta) | 674 | const struct GNUNET_CONTAINER_MetaData *meta) |
675 | { | 675 | { |
676 | char *name; | 676 | char *name; |