diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-11-01 20:47:52 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-11-01 20:47:52 +0000 |
commit | 652e89b59ed2207c2c12172fdabcd6e659995c81 (patch) | |
tree | f054c819d483c1056e18c1099afd4c7fcd2582a0 /src/util/pseudonym.c | |
parent | 5e4113e83368849500792e57946c3d8dd9e548d8 (diff) | |
download | gnunet-652e89b59ed2207c2c12172fdabcd6e659995c81.tar.gz gnunet-652e89b59ed2207c2c12172fdabcd6e659995c81.zip |
fixing bio testcase and a bug in bio.c, also indenting
Diffstat (limited to 'src/util/pseudonym.c')
-rw-r--r-- | src/util/pseudonym.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c index bf746c66b..0465b1b2c 100644 --- a/src/util/pseudonym.c +++ b/src/util/pseudonym.c | |||
@@ -193,7 +193,7 @@ write_pseudonym_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
193 | tag += off; | 193 | tag += off; |
194 | } | 194 | } |
195 | buf = GNUNET_malloc (tag); | 195 | buf = GNUNET_malloc (tag); |
196 | ((int32_t *) buf)[0] = htonl (ranking); /* ranking */ | 196 | ((int32_t *) buf)[0] = htonl (ranking); /* ranking */ |
197 | if (ns_name != NULL) | 197 | if (ns_name != NULL) |
198 | { | 198 | { |
199 | memcpy (&buf[sizeof (int32_t)], ns_name, off + 1); | 199 | memcpy (&buf[sizeof (int32_t)], ns_name, off + 1); |
@@ -211,7 +211,8 @@ write_pseudonym_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
211 | GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL)); | 211 | GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL)); |
212 | GNUNET_break | 212 | GNUNET_break |
213 | (tag == GNUNET_DISK_fn_write (fn, buf, tag, GNUNET_DISK_PERM_USER_READ | 213 | (tag == GNUNET_DISK_fn_write (fn, buf, tag, GNUNET_DISK_PERM_USER_READ |
214 | | GNUNET_DISK_PERM_USER_WRITE | GNUNET_DISK_PERM_GROUP_READ)); | 214 | | GNUNET_DISK_PERM_USER_WRITE | |
215 | GNUNET_DISK_PERM_GROUP_READ)); | ||
215 | GNUNET_free (fn); | 216 | GNUNET_free (fn); |
216 | GNUNET_free (buf); | 217 | GNUNET_free (buf); |
217 | /* create entry for pseudonym name in names */ | 218 | /* create entry for pseudonym name in names */ |
@@ -365,8 +366,9 @@ GNUNET_PSEUDONYM_id_to_name (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
365 | if (0 == STAT (fn, &sbuf)) | 366 | if (0 == STAT (fn, &sbuf)) |
366 | GNUNET_DISK_file_size (fn, &len, GNUNET_YES); | 367 | GNUNET_DISK_file_size (fn, &len, GNUNET_YES); |
367 | fh = GNUNET_DISK_file_open (fn, GNUNET_DISK_OPEN_CREATE | 368 | fh = GNUNET_DISK_file_open (fn, GNUNET_DISK_OPEN_CREATE |
368 | | GNUNET_DISK_OPEN_READWRITE, GNUNET_DISK_PERM_USER_READ | 369 | | GNUNET_DISK_OPEN_READWRITE, |
369 | | GNUNET_DISK_PERM_USER_WRITE); | 370 | GNUNET_DISK_PERM_USER_READ | |
371 | GNUNET_DISK_PERM_USER_WRITE); | ||
370 | i = 0; | 372 | i = 0; |
371 | idx = -1; | 373 | idx = -1; |
372 | while ((len >= sizeof (GNUNET_HashCode)) && | 374 | while ((len >= sizeof (GNUNET_HashCode)) && |
@@ -437,11 +439,14 @@ GNUNET_PSEUDONYM_name_to_id (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
437 | return GNUNET_SYSERR; | 439 | return GNUNET_SYSERR; |
438 | } | 440 | } |
439 | fh = GNUNET_DISK_file_open (fn, GNUNET_DISK_OPEN_CREATE | 441 | fh = GNUNET_DISK_file_open (fn, GNUNET_DISK_OPEN_CREATE |
440 | | GNUNET_DISK_OPEN_READWRITE, GNUNET_DISK_PERM_USER_READ | 442 | | GNUNET_DISK_OPEN_READWRITE, |
441 | | GNUNET_DISK_PERM_USER_WRITE); | 443 | GNUNET_DISK_PERM_USER_READ | |
444 | GNUNET_DISK_PERM_USER_WRITE); | ||
442 | GNUNET_free (fn); | 445 | GNUNET_free (fn); |
443 | GNUNET_DISK_file_seek (fh, idx * sizeof (GNUNET_HashCode), GNUNET_DISK_SEEK_SET); | 446 | GNUNET_DISK_file_seek (fh, idx * sizeof (GNUNET_HashCode), |
444 | if (sizeof (GNUNET_HashCode) != GNUNET_DISK_file_read (fh, nsid, sizeof (GNUNET_HashCode))) | 447 | GNUNET_DISK_SEEK_SET); |
448 | if (sizeof (GNUNET_HashCode) != | ||
449 | GNUNET_DISK_file_read (fh, nsid, sizeof (GNUNET_HashCode))) | ||
445 | { | 450 | { |
446 | GNUNET_DISK_file_close (fh); | 451 | GNUNET_DISK_file_close (fh); |
447 | return GNUNET_SYSERR; | 452 | return GNUNET_SYSERR; |
@@ -462,12 +467,12 @@ struct ListPseudonymClosure | |||
462 | * FIXME | 467 | * FIXME |
463 | */ | 468 | */ |
464 | GNUNET_PSEUDONYM_Iterator iterator; | 469 | GNUNET_PSEUDONYM_Iterator iterator; |
465 | 470 | ||
466 | /** | 471 | /** |
467 | * FIXME | 472 | * FIXME |
468 | */ | 473 | */ |
469 | void *closure; | 474 | void *closure; |
470 | 475 | ||
471 | /** | 476 | /** |
472 | * FIXME | 477 | * FIXME |
473 | */ | 478 | */ |
@@ -575,9 +580,7 @@ GNUNET_PSEUDONYM_rank (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
575 | * @param data value of entry to insert | 580 | * @param data value of entry to insert |
576 | */ | 581 | */ |
577 | static int | 582 | static int |
578 | merge_meta_helper (void *cls, | 583 | merge_meta_helper (void *cls, EXTRACTOR_KeywordType type, const char *data) |
579 | EXTRACTOR_KeywordType type, | ||
580 | const char *data) | ||
581 | { | 584 | { |
582 | struct GNUNET_CONTAINER_MetaData *meta = cls; | 585 | struct GNUNET_CONTAINER_MetaData *meta = cls; |
583 | GNUNET_CONTAINER_meta_data_insert (meta, type, data); | 586 | GNUNET_CONTAINER_meta_data_insert (meta, type, data); |