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/json | |
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/json')
-rw-r--r-- | src/json/json_generator.c | 4 | ||||
-rw-r--r-- | src/json/json_gnsrecord.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/json/json_generator.c b/src/json/json_generator.c index 594fcaf27..3f82a5f17 100644 --- a/src/json/json_generator.c +++ b/src/json/json_generator.c | |||
@@ -254,7 +254,9 @@ GNUNET_JSON_from_gnsrecord (const char*rname, | |||
254 | rel_exp.rel_value_us = rd[i].expiration_time; | 254 | rel_exp.rel_value_us = rd[i].expiration_time; |
255 | expiration_time_str = GNUNET_STRINGS_relative_time_to_string (rel_exp, | 255 | expiration_time_str = GNUNET_STRINGS_relative_time_to_string (rel_exp, |
256 | GNUNET_NO); | 256 | GNUNET_NO); |
257 | } else { | 257 | } |
258 | else | ||
259 | { | ||
258 | abs_exp.abs_value_us = rd[i].expiration_time; | 260 | abs_exp.abs_value_us = rd[i].expiration_time; |
259 | expiration_time_str = GNUNET_STRINGS_absolute_time_to_string (abs_exp); | 261 | expiration_time_str = GNUNET_STRINGS_absolute_time_to_string (abs_exp); |
260 | } | 262 | } |
diff --git a/src/json/json_gnsrecord.c b/src/json/json_gnsrecord.c index fe5858f06..7e11aba94 100644 --- a/src/json/json_gnsrecord.c +++ b/src/json/json_gnsrecord.c | |||
@@ -136,8 +136,8 @@ parse_record (json_t *data, struct GNUNET_GNSRECORD_Data *rd) | |||
136 | } | 136 | } |
137 | else if ((1 != rel_exp) && | 137 | else if ((1 != rel_exp) && |
138 | (GNUNET_OK == | 138 | (GNUNET_OK == |
139 | GNUNET_STRINGS_fancy_time_to_absolute (expiration_time, | 139 | GNUNET_STRINGS_fancy_time_to_absolute (expiration_time, |
140 | &abs_expiration_time))) | 140 | &abs_expiration_time))) |
141 | { | 141 | { |
142 | rd->expiration_time = abs_expiration_time.abs_value_us; | 142 | rd->expiration_time = abs_expiration_time.abs_value_us; |
143 | } | 143 | } |