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) |
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) for (le = ih->attrs->list_head; NULL != le; le = le->next) attrs_count++; - //Worst case we have one attestation per attribute + // Worst case we have one attestation per attribute attrs_record = GNUNET_malloc (2 * attrs_count * sizeof(struct GNUNET_GNSRECORD_Data)); 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); struct GNUNET_JSON_Specification GNUNET_RECLAIM_JSON_spec_claim_attest (struct GNUNET_RECLAIM_Attestation **attr); - 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, } } + /** * Mapping of attribute type numbers to human-readable * 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, if (GNUNET_OK == GNUNET_RECLAIM_attestation_get_expiration (attest, &exp)) { - json_object_set_new (attest_obj, "expiration", json_integer (exp.abs_value_us)); + json_object_set_new (attest_obj, "expiration", json_integer ( + exp.abs_value_us)); } id_str = GNUNET_STRINGS_data_to_string_alloc (&attest->id, sizeof(attest->id)); @@ -597,7 +598,7 @@ attest_collect (void *cls, json_object_set_new (attr_obj, "name", json_string ( ale->attribute->name)); - json_object_set_new (attr_obj, "flag", json_string ("1")); //FIXME + json_object_set_new (attr_obj, "flag", json_string ("1")); // FIXME type = GNUNET_RECLAIM_attribute_number_to_typename (ale->attribute->type); json_object_set_new (attr_obj, "type", json_string (type)); 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 int GNUNET_RECLAIM_attestation_get_expiration (const struct GNUNET_RECLAIM_Attestation *attest, - struct GNUNET_TIME_Absolute* exp) + struct GNUNET_TIME_Absolute*exp) { unsigned int i; 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, */ struct GNUNET_RECLAIM_Attribute * GNUNET_RECLAIM_attribute_new (const char *attr_name, - const struct GNUNET_RECLAIM_Identifier *attestation, + const struct + GNUNET_RECLAIM_Identifier *attestation, uint32_t type, const void *data, size_t data_size) |