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/container_meta_data.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/container_meta_data.c')
-rw-r--r-- | src/util/container_meta_data.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c index 5c70f95ff..ebf6ce778 100644 --- a/src/util/container_meta_data.c +++ b/src/util/container_meta_data.c | |||
@@ -196,8 +196,7 @@ GNUNET_CONTAINER_meta_data_get_contents (const struct | |||
196 | { | 196 | { |
197 | if ((iter != NULL) && | 197 | if ((iter != NULL) && |
198 | (GNUNET_OK != iter (iter_cls, | 198 | (GNUNET_OK != iter (iter_cls, |
199 | md->items[i].type, | 199 | md->items[i].type, md->items[i].data))) |
200 | md->items[i].data))) | ||
201 | return GNUNET_SYSERR; | 200 | return GNUNET_SYSERR; |
202 | } | 201 | } |
203 | else | 202 | else |
@@ -487,8 +486,7 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData | |||
487 | hdr->version = htonl (md == NULL ? 1 : 0); | 486 | hdr->version = htonl (md == NULL ? 1 : 0); |
488 | hdr->entries = htonl (ic); | 487 | hdr->entries = htonl (ic); |
489 | for (i = 0; i < ic; i++) | 488 | for (i = 0; i < ic; i++) |
490 | ((uint32_t *) &hdr[1])[i] = | 489 | ((uint32_t *) & hdr[1])[i] = htonl ((uint32_t) md->items[i].type); |
491 | htonl ((uint32_t) md->items[i].type); | ||
492 | pos = sizeof (struct MetaDataHeader); | 490 | pos = sizeof (struct MetaDataHeader); |
493 | pos += sizeof (unsigned int) * ic; | 491 | pos += sizeof (unsigned int) * ic; |
494 | for (i = 0; i < ic; i++) | 492 | for (i = 0; i < ic; i++) |
@@ -556,7 +554,8 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData | |||
556 | */ | 554 | */ |
557 | ssize_t | 555 | ssize_t |
558 | GNUNET_CONTAINER_meta_data_get_serialized_size (const struct | 556 | GNUNET_CONTAINER_meta_data_get_serialized_size (const struct |
559 | GNUNET_CONTAINER_MetaData *md, | 557 | GNUNET_CONTAINER_MetaData * |
558 | md, | ||
560 | enum | 559 | enum |
561 | GNUNET_CONTAINER_MetaDataSerializationOptions | 560 | GNUNET_CONTAINER_MetaDataSerializationOptions |
562 | opt) | 561 | opt) |
@@ -579,7 +578,7 @@ GNUNET_CONTAINER_meta_data_get_serialized_size (const struct | |||
579 | hdr->version = htonl (md == NULL ? 1 : 0); | 578 | hdr->version = htonl (md == NULL ? 1 : 0); |
580 | hdr->entries = htonl (ic); | 579 | hdr->entries = htonl (ic); |
581 | for (i = 0; i < ic; i++) | 580 | for (i = 0; i < ic; i++) |
582 | ((uint32_t *) &hdr[1])[i] = htonl ((uint32_t) md->items[i].type); | 581 | ((uint32_t *) & hdr[1])[i] = htonl ((uint32_t) md->items[i].type); |
583 | pos = sizeof (struct MetaDataHeader); | 582 | pos = sizeof (struct MetaDataHeader); |
584 | pos += sizeof (uint32_t) * ic; | 583 | pos += sizeof (uint32_t) * ic; |
585 | for (i = 0; i < ic; i++) | 584 | for (i = 0; i < ic; i++) |