diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
commit | 7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 (patch) | |
tree | 5f1b18463f641f24fad519e0aefb60b97d707b52 /src/reclaim | |
parent | 28ab2c446fba4980a8295d59fdf203a028a35dd6 (diff) | |
download | gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.tar.gz gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.zip |
merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188
Diffstat (limited to 'src/reclaim')
-rw-r--r-- | src/reclaim/gnunet-service-reclaim_tickets.c | 2 | ||||
-rw-r--r-- | src/reclaim/json_reclaim.h | 1 | ||||
-rw-r--r-- | src/reclaim/plugin_reclaim_attribute_basic.c | 1 | ||||
-rw-r--r-- | src/reclaim/plugin_rest_reclaim.c | 5 | ||||
-rw-r--r-- | src/reclaim/reclaim_attestation.c | 2 | ||||
-rw-r--r-- | src/reclaim/reclaim_attribute.c | 3 |
6 files changed, 8 insertions, 6 deletions
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c index f170b6d84..7e6b07514 100644 --- a/src/reclaim/gnunet-service-reclaim_tickets.c +++ b/src/reclaim/gnunet-service-reclaim_tickets.c | |||
@@ -1292,7 +1292,7 @@ issue_ticket (struct TicketIssueHandle *ih) | |||
1292 | for (le = ih->attrs->list_head; NULL != le; le = le->next) | 1292 | for (le = ih->attrs->list_head; NULL != le; le = le->next) |
1293 | attrs_count++; | 1293 | attrs_count++; |
1294 | 1294 | ||
1295 | //Worst case we have one attestation per attribute | 1295 | // Worst case we have one attestation per attribute |
1296 | attrs_record = | 1296 | attrs_record = |
1297 | GNUNET_malloc (2 * attrs_count * sizeof(struct GNUNET_GNSRECORD_Data)); | 1297 | GNUNET_malloc (2 * attrs_count * sizeof(struct GNUNET_GNSRECORD_Data)); |
1298 | i = 0; | 1298 | i = 0; |
diff --git a/src/reclaim/json_reclaim.h b/src/reclaim/json_reclaim.h index 61ddb4378..c57971dcb 100644 --- a/src/reclaim/json_reclaim.h +++ b/src/reclaim/json_reclaim.h | |||
@@ -56,4 +56,3 @@ GNUNET_RECLAIM_JSON_spec_ticket (struct GNUNET_RECLAIM_Ticket **ticket); | |||
56 | struct GNUNET_JSON_Specification | 56 | struct GNUNET_JSON_Specification |
57 | GNUNET_RECLAIM_JSON_spec_claim_attest (struct | 57 | GNUNET_RECLAIM_JSON_spec_claim_attest (struct |
58 | GNUNET_RECLAIM_Attestation **attr); | 58 | GNUNET_RECLAIM_Attestation **attr); |
59 | |||
diff --git a/src/reclaim/plugin_reclaim_attribute_basic.c b/src/reclaim/plugin_reclaim_attribute_basic.c index 47fdd5f11..286186a93 100644 --- a/src/reclaim/plugin_reclaim_attribute_basic.c +++ b/src/reclaim/plugin_reclaim_attribute_basic.c | |||
@@ -90,6 +90,7 @@ basic_string_to_value (void *cls, | |||
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
93 | |||
93 | /** | 94 | /** |
94 | * Mapping of attribute type numbers to human-readable | 95 | * Mapping of attribute type numbers to human-readable |
95 | * attribute type names. | 96 | * attribute type names. |
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c index 654df175e..10ee2f801 100644 --- a/src/reclaim/plugin_rest_reclaim.c +++ b/src/reclaim/plugin_rest_reclaim.c | |||
@@ -576,7 +576,8 @@ attest_collect (void *cls, | |||
576 | if (GNUNET_OK == GNUNET_RECLAIM_attestation_get_expiration (attest, | 576 | if (GNUNET_OK == GNUNET_RECLAIM_attestation_get_expiration (attest, |
577 | &exp)) | 577 | &exp)) |
578 | { | 578 | { |
579 | json_object_set_new (attest_obj, "expiration", json_integer (exp.abs_value_us)); | 579 | json_object_set_new (attest_obj, "expiration", json_integer ( |
580 | exp.abs_value_us)); | ||
580 | } | 581 | } |
581 | id_str = GNUNET_STRINGS_data_to_string_alloc (&attest->id, | 582 | id_str = GNUNET_STRINGS_data_to_string_alloc (&attest->id, |
582 | sizeof(attest->id)); | 583 | sizeof(attest->id)); |
@@ -597,7 +598,7 @@ attest_collect (void *cls, | |||
597 | json_object_set_new (attr_obj, "name", json_string ( | 598 | json_object_set_new (attr_obj, "name", json_string ( |
598 | ale->attribute->name)); | 599 | ale->attribute->name)); |
599 | 600 | ||
600 | json_object_set_new (attr_obj, "flag", json_string ("1")); //FIXME | 601 | json_object_set_new (attr_obj, "flag", json_string ("1")); // FIXME |
601 | type = GNUNET_RECLAIM_attribute_number_to_typename (ale->attribute->type); | 602 | type = GNUNET_RECLAIM_attribute_number_to_typename (ale->attribute->type); |
602 | json_object_set_new (attr_obj, "type", json_string (type)); | 603 | json_object_set_new (attr_obj, "type", json_string (type)); |
603 | json_object_set_new (attr_obj, "id", json_string ("")); | 604 | json_object_set_new (attr_obj, "id", json_string ("")); |
diff --git a/src/reclaim/reclaim_attestation.c b/src/reclaim/reclaim_attestation.c index bdf80a709..1f2b1890b 100644 --- a/src/reclaim/reclaim_attestation.c +++ b/src/reclaim/reclaim_attestation.c | |||
@@ -552,7 +552,7 @@ GNUNET_RECLAIM_attestation_get_issuer (const struct | |||
552 | int | 552 | int |
553 | GNUNET_RECLAIM_attestation_get_expiration (const struct | 553 | GNUNET_RECLAIM_attestation_get_expiration (const struct |
554 | GNUNET_RECLAIM_Attestation *attest, | 554 | GNUNET_RECLAIM_Attestation *attest, |
555 | struct GNUNET_TIME_Absolute* exp) | 555 | struct GNUNET_TIME_Absolute*exp) |
556 | { | 556 | { |
557 | unsigned int i; | 557 | unsigned int i; |
558 | struct Plugin *plugin; | 558 | struct Plugin *plugin; |
diff --git a/src/reclaim/reclaim_attribute.c b/src/reclaim/reclaim_attribute.c index 69c5351d3..05bdc1ac6 100644 --- a/src/reclaim/reclaim_attribute.c +++ b/src/reclaim/reclaim_attribute.c | |||
@@ -230,7 +230,8 @@ GNUNET_RECLAIM_attribute_value_to_string (uint32_t type, | |||
230 | */ | 230 | */ |
231 | struct GNUNET_RECLAIM_Attribute * | 231 | struct GNUNET_RECLAIM_Attribute * |
232 | GNUNET_RECLAIM_attribute_new (const char *attr_name, | 232 | GNUNET_RECLAIM_attribute_new (const char *attr_name, |
233 | const struct GNUNET_RECLAIM_Identifier *attestation, | 233 | const struct |
234 | GNUNET_RECLAIM_Identifier *attestation, | ||
234 | uint32_t type, | 235 | uint32_t type, |
235 | const void *data, | 236 | const void *data, |
236 | size_t data_size) | 237 | size_t data_size) |