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/gns | |
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/gns')
-rw-r--r-- | src/gns/gns_api.c | 1 | ||||
-rw-r--r-- | src/gns/gnunet-dns2gns.c | 2 | ||||
-rw-r--r-- | src/gns/nss/nss_gns.c | 2 | ||||
-rw-r--r-- | src/gns/nss/nss_gns_query.c | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c index 0d99d822e..bf95bf340 100644 --- a/src/gns/gns_api.c +++ b/src/gns/gns_api.c | |||
@@ -427,4 +427,5 @@ GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle, | |||
427 | proc_cls); | 427 | proc_cls); |
428 | } | 428 | } |
429 | 429 | ||
430 | |||
430 | /* end of gns_api.c */ | 431 | /* end of gns_api.c */ |
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index 74309f554..0a9b7c861 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/gns/gnunet-dns2gns.c | |||
@@ -190,6 +190,7 @@ do_shutdown (void *cls) | |||
190 | } | 190 | } |
191 | } | 191 | } |
192 | 192 | ||
193 | |||
193 | /** | 194 | /** |
194 | * Shuffle answers | 195 | * Shuffle answers |
195 | * Fisher-Yates (aka Knuth) Shuffle | 196 | * Fisher-Yates (aka Knuth) Shuffle |
@@ -216,6 +217,7 @@ shuffle_answers (struct Request *request) | |||
216 | } | 217 | } |
217 | } | 218 | } |
218 | 219 | ||
220 | |||
219 | /** | 221 | /** |
220 | * Send the response for the given request and clean up. | 222 | * Send the response for the given request and clean up. |
221 | * | 223 | * |
diff --git a/src/gns/nss/nss_gns.c b/src/gns/nss/nss_gns.c index 36799ba3a..77b4340ee 100644 --- a/src/gns/nss/nss_gns.c +++ b/src/gns/nss/nss_gns.c | |||
@@ -38,7 +38,7 @@ | |||
38 | /** macro to align idx to 32bit boundary */ | 38 | /** macro to align idx to 32bit boundary */ |
39 | #define ALIGN(idx) do { \ | 39 | #define ALIGN(idx) do { \ |
40 | if (idx % sizeof(void*)) \ | 40 | if (idx % sizeof(void*)) \ |
41 | idx += (sizeof(void*) - idx % sizeof(void*)); /* Align on 32 bit boundary */ \ | 41 | idx += (sizeof(void*) - idx % sizeof(void*)); /* Align on 32 bit boundary */ \ |
42 | } while (0) | 42 | } while (0) |
43 | 43 | ||
44 | 44 | ||
diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c index 11e46ad7f..96e8e10da 100644 --- a/src/gns/nss/nss_gns_query.c +++ b/src/gns/nss/nss_gns_query.c | |||
@@ -150,7 +150,7 @@ query_gns: | |||
150 | if (1 == retry) | 150 | if (1 == retry) |
151 | return -2; /* no go -> service unavailable */ | 151 | return -2; /* no go -> service unavailable */ |
152 | retry = 1; | 152 | retry = 1; |
153 | system("gnunet-arm -s"); | 153 | system ("gnunet-arm -s"); |
154 | goto query_gns; /* Try again */ | 154 | goto query_gns; /* Try again */ |
155 | } | 155 | } |
156 | if (3 == WEXITSTATUS (ret)) | 156 | if (3 == WEXITSTATUS (ret)) |