[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 02/02: introduce have_rest; fix warnings
|
From: |
gnunet |
|
Subject: |
[gnunet] 02/02: introduce have_rest; fix warnings |
|
Date: |
Wed, 06 May 2020 12:00:04 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit b089b3c07cb9a38f18e58225d93e1335f24ced17
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Wed May 6 11:55:04 2020 +0200
introduce have_rest; fix warnings
---
src/Makefile.am | 4 +---
src/abd/gnunet-abd.c | 6 +++---
src/gns/Makefile.am | 4 +---
src/gns/gnunet-gns-proxy.c | 2 +-
src/identity/Makefile.am | 4 +---
src/include/gnunet_identity_service.h | 2 +-
src/namestore/Makefile.am | 4 +---
src/namestore/gnunet-namestore.c | 2 +-
src/peerinfo-tool/Makefile.am | 4 +---
src/reclaim/Makefile.am | 4 +---
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
POSTGRES_DIR = pq
endif
-if HAVE_MHD
-if HAVE_JSON
+if HAVE_REST
REST_DIR = rest
endif
-endif
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,
* @param ego an ego known to identity service, or NULL
*/
static void
-identity_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego)
+identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
{
const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
@@ -547,7 +547,7 @@ get_existing_record (void *cls,
static void
-store_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego)
+store_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
{
const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
@@ -648,7 +648,7 @@ store_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego)
static void
-sign_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego)
+sign_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
{
const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
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
endif
endif
-if HAVE_MHD
-if HAVE_JSON
+if HAVE_REST
REST_PLUGIN = libgnunet_plugin_rest_gns.la
endif
-endif
plugin_LTLIBRARIES = \
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)
s5r->gns_lookup = GNUNET_GNS_lookup_with_tld (gns_handle,
s5r->domain,
GNUNET_DNSPARSER_TYPE_A,
- GNUNET_NO /* only cached
*/,
+
GNUNET_GNS_LO_LOCAL_MASTER /* only cached */,
&handle_gns_result,
s5r);
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
XLIB = -lgcov
endif
-if HAVE_MHD
-if HAVE_JSON
+if HAVE_REST
plugin_LTLIBRARIES = libgnunet_plugin_rest_identity.la
endif
-endif
pkgcfgdir= $(pkgdatadir)/config.d/
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);
*/
typedef void
(*GNUNET_IDENTITY_EgoCallback) (void *cls,
- const struct GNUNET_IDENTITY_Ego *ego);
+ struct GNUNET_IDENTITY_Ego *ego);
/**
* 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 = \
$(check_SCRIPTS)
endif
-if HAVE_MHD
-if HAVE_JSON
+if HAVE_REST
REST_PLUGIN = libgnunet_plugin_rest_namestore.la
endif
-endif
lib_LTLIBRARIES = \
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)
* @param ego an ego known to identity service, or NULL
*/
static void
-identity_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego)
+identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
{
const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
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
XLIB = -lgcov
endif
-if HAVE_MHD
-if HAVE_JSON
+if HAVE_REST
REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la
endif
-endif
plugindir = $(libdir)/gnunet
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
endif
-if HAVE_MHD
-if HAVE_JSON
+if HAVE_REST
REST_PLUGIN = \
libgnunet_plugin_rest_openid_connect.la \
libgnunet_plugin_rest_reclaim.la
endif
-endif
if HAVE_JSON
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)
* @param ego the ego, NULL if not found
*/
static void
-ego_callback (void *cls, const struct GNUNET_IDENTITY_Ego *ego)
+ego_callback (void *cls, struct GNUNET_IDENTITY_Ego *ego)
{
struct GNUNET_CRYPTO_EcdsaPublicKey key;
const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
--
To stop receiving notification emails like this one, please contact
address@hidden.