diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2020-05-06 11:55:04 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2020-05-06 11:55:04 +0200 |
commit | b089b3c07cb9a38f18e58225d93e1335f24ced17 (patch) | |
tree | 8df17078d46333d25140a72e4e9c3719085465f7 | |
parent | 331a6079913db5e630c113b0e022c9587499d177 (diff) | |
download | gnunet-b089b3c07cb9a38f18e58225d93e1335f24ced17.tar.gz gnunet-b089b3c07cb9a38f18e58225d93e1335f24ced17.zip |
introduce have_rest; fix warnings
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/abd/gnunet-abd.c | 6 | ||||
-rw-r--r-- | src/gns/Makefile.am | 4 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 2 | ||||
-rw-r--r-- | src/identity/Makefile.am | 4 | ||||
-rw-r--r-- | src/include/gnunet_identity_service.h | 2 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 4 | ||||
-rw-r--r-- | src/namestore/gnunet-namestore.c | 2 | ||||
-rw-r--r-- | src/peerinfo-tool/Makefile.am | 4 | ||||
-rw-r--r-- | src/reclaim/Makefile.am | 4 | ||||
-rw-r--r-- | src/revocation/gnunet-revocation.c | 2 |
11 files changed, 13 insertions, 25 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c769ac5af..4642b6215 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -58,11 +58,9 @@ if HAVE_POSTGRESQL | |||
58 | POSTGRES_DIR = pq | 58 | POSTGRES_DIR = pq |
59 | endif | 59 | endif |
60 | 60 | ||
61 | if HAVE_MHD | 61 | if HAVE_REST |
62 | if HAVE_JSON | ||
63 | REST_DIR = rest | 62 | REST_DIR = rest |
64 | endif | 63 | endif |
65 | endif | ||
66 | 64 | ||
67 | 65 | ||
68 | SUBDIRS = \ | 66 | SUBDIRS = \ |
diff --git a/src/abd/gnunet-abd.c b/src/abd/gnunet-abd.c index 6cf4aab0d..f7e03fb4a 100644 --- a/src/abd/gnunet-abd.c +++ b/src/abd/gnunet-abd.c | |||
@@ -384,7 +384,7 @@ handle_verify_result (void *cls, | |||
384 | * @param ego an ego known to identity service, or NULL | 384 | * @param ego an ego known to identity service, or NULL |
385 | */ | 385 | */ |
386 | static void | 386 | static void |
387 | identity_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) | 387 | identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego) |
388 | { | 388 | { |
389 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 389 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
390 | 390 | ||
@@ -547,7 +547,7 @@ get_existing_record (void *cls, | |||
547 | 547 | ||
548 | 548 | ||
549 | static void | 549 | static void |
550 | store_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) | 550 | store_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego) |
551 | { | 551 | { |
552 | const struct GNUNET_CONFIGURATION_Handle *cfg = cls; | 552 | const struct GNUNET_CONFIGURATION_Handle *cfg = cls; |
553 | 553 | ||
@@ -648,7 +648,7 @@ store_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) | |||
648 | 648 | ||
649 | 649 | ||
650 | static void | 650 | static void |
651 | sign_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) | 651 | sign_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego) |
652 | { | 652 | { |
653 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 653 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
654 | struct GNUNET_ABD_Delegate *dele; | 654 | struct GNUNET_ABD_Delegate *dele; |
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index abd5d5b48..7a5f7cfd8 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -88,11 +88,9 @@ bin_PROGRAMS += gnunet-bcd | |||
88 | endif | 88 | endif |
89 | endif | 89 | endif |
90 | 90 | ||
91 | if HAVE_MHD | 91 | if HAVE_REST |
92 | if HAVE_JSON | ||
93 | REST_PLUGIN = libgnunet_plugin_rest_gns.la | 92 | REST_PLUGIN = libgnunet_plugin_rest_gns.la |
94 | endif | 93 | endif |
95 | endif | ||
96 | 94 | ||
97 | plugin_LTLIBRARIES = \ | 95 | plugin_LTLIBRARIES = \ |
98 | libgnunet_plugin_block_gns.la \ | 96 | libgnunet_plugin_block_gns.la \ |
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 956faf983..eb6c6852e 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -3378,7 +3378,7 @@ do_s5r_read (void *cls) | |||
3378 | s5r->gns_lookup = GNUNET_GNS_lookup_with_tld (gns_handle, | 3378 | s5r->gns_lookup = GNUNET_GNS_lookup_with_tld (gns_handle, |
3379 | s5r->domain, | 3379 | s5r->domain, |
3380 | GNUNET_DNSPARSER_TYPE_A, | 3380 | GNUNET_DNSPARSER_TYPE_A, |
3381 | GNUNET_NO /* only cached */, | 3381 | GNUNET_GNS_LO_LOCAL_MASTER /* only cached */, |
3382 | &handle_gns_result, | 3382 | &handle_gns_result, |
3383 | s5r); | 3383 | s5r); |
3384 | break; | 3384 | break; |
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am index 9f580f0f9..17e72c784 100644 --- a/src/identity/Makefile.am +++ b/src/identity/Makefile.am | |||
@@ -8,11 +8,9 @@ if USE_COVERAGE | |||
8 | XLIB = -lgcov | 8 | XLIB = -lgcov |
9 | endif | 9 | endif |
10 | 10 | ||
11 | if HAVE_MHD | 11 | if HAVE_REST |
12 | if HAVE_JSON | ||
13 | plugin_LTLIBRARIES = libgnunet_plugin_rest_identity.la | 12 | plugin_LTLIBRARIES = libgnunet_plugin_rest_identity.la |
14 | endif | 13 | endif |
15 | endif | ||
16 | 14 | ||
17 | pkgcfgdir= $(pkgdatadir)/config.d/ | 15 | pkgcfgdir= $(pkgdatadir)/config.d/ |
18 | 16 | ||
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h index af5beb5f7..81af671e2 100644 --- a/src/include/gnunet_identity_service.h +++ b/src/include/gnunet_identity_service.h | |||
@@ -300,7 +300,7 @@ GNUNET_IDENTITY_cancel (struct GNUNET_IDENTITY_Operation *op); | |||
300 | */ | 300 | */ |
301 | typedef void | 301 | typedef void |
302 | (*GNUNET_IDENTITY_EgoCallback) (void *cls, | 302 | (*GNUNET_IDENTITY_EgoCallback) (void *cls, |
303 | const struct GNUNET_IDENTITY_Ego *ego); | 303 | struct GNUNET_IDENTITY_Ego *ego); |
304 | 304 | ||
305 | /** | 305 | /** |
306 | * Handle for ego lookup. | 306 | * Handle for ego lookup. |
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 12d730f36..94861b478 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -99,11 +99,9 @@ TESTS = \ | |||
99 | $(check_SCRIPTS) | 99 | $(check_SCRIPTS) |
100 | endif | 100 | endif |
101 | 101 | ||
102 | if HAVE_MHD | 102 | if HAVE_REST |
103 | if HAVE_JSON | ||
104 | REST_PLUGIN = libgnunet_plugin_rest_namestore.la | 103 | REST_PLUGIN = libgnunet_plugin_rest_namestore.la |
105 | endif | 104 | endif |
106 | endif | ||
107 | 105 | ||
108 | lib_LTLIBRARIES = \ | 106 | lib_LTLIBRARIES = \ |
109 | libgnunetnamestore.la | 107 | libgnunetnamestore.la |
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c index 508566a49..3514f4fd9 100644 --- a/src/namestore/gnunet-namestore.c +++ b/src/namestore/gnunet-namestore.c | |||
@@ -1265,7 +1265,7 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
1265 | * @param ego an ego known to identity service, or NULL | 1265 | * @param ego an ego known to identity service, or NULL |
1266 | */ | 1266 | */ |
1267 | static void | 1267 | static void |
1268 | identity_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) | 1268 | identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego) |
1269 | { | 1269 | { |
1270 | const struct GNUNET_CONFIGURATION_Handle *cfg = cls; | 1270 | const struct GNUNET_CONFIGURATION_Handle *cfg = cls; |
1271 | 1271 | ||
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index 05173d551..93252570c 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am | |||
@@ -6,11 +6,9 @@ if USE_COVERAGE | |||
6 | XLIB = -lgcov | 6 | XLIB = -lgcov |
7 | endif | 7 | endif |
8 | 8 | ||
9 | if HAVE_MHD | 9 | if HAVE_REST |
10 | if HAVE_JSON | ||
11 | REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la | 10 | REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la |
12 | endif | 11 | endif |
13 | endif | ||
14 | 12 | ||
15 | plugindir = $(libdir)/gnunet | 13 | plugindir = $(libdir)/gnunet |
16 | 14 | ||
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am index b2a4e6bac..6d448cc3c 100644 --- a/src/reclaim/Makefile.am +++ b/src/reclaim/Makefile.am | |||
@@ -9,13 +9,11 @@ if USE_COVERAGE | |||
9 | endif | 9 | endif |
10 | 10 | ||
11 | 11 | ||
12 | if HAVE_MHD | 12 | if HAVE_REST |
13 | if HAVE_JSON | ||
14 | REST_PLUGIN = \ | 13 | REST_PLUGIN = \ |
15 | libgnunet_plugin_rest_openid_connect.la \ | 14 | libgnunet_plugin_rest_openid_connect.la \ |
16 | libgnunet_plugin_rest_reclaim.la | 15 | libgnunet_plugin_rest_reclaim.la |
17 | endif | 16 | endif |
18 | endif | ||
19 | 17 | ||
20 | if HAVE_JSON | 18 | if HAVE_JSON |
21 | ATTESTATION_PLUGIN = \ | 19 | ATTESTATION_PLUGIN = \ |
diff --git a/src/revocation/gnunet-revocation.c b/src/revocation/gnunet-revocation.c index 1edd98f0e..0e1e482ab 100644 --- a/src/revocation/gnunet-revocation.c +++ b/src/revocation/gnunet-revocation.c | |||
@@ -323,7 +323,7 @@ calculate_pow (void *cls) | |||
323 | * @param ego the ego, NULL if not found | 323 | * @param ego the ego, NULL if not found |
324 | */ | 324 | */ |
325 | static void | 325 | static void |
326 | ego_callback (void *cls, const struct GNUNET_IDENTITY_Ego *ego) | 326 | ego_callback (void *cls, struct GNUNET_IDENTITY_Ego *ego) |
327 | { | 327 | { |
328 | struct GNUNET_CRYPTO_EcdsaPublicKey key; | 328 | struct GNUNET_CRYPTO_EcdsaPublicKey key; |
329 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 329 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |