[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 02/02: Various: Silence warnings
|
From: |
gnunet |
|
Subject: |
[gnunet] 02/02: Various: Silence warnings |
|
Date: |
Sun, 04 Feb 2024 13:47:05 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 9c5f011042893f3f268f868a6133e5b405b0dd51
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Feb 4 13:46:31 2024 +0100
Various: Silence warnings
NEWS: -
---
contrib/gana | 2 +-
contrib/handbook | 2 +-
po/POTFILES.in | 2 +-
src/include/gnunet_common.h | 2 +-
src/lib/util/gnunet_error_codes.c | 1 +
src/lib/util/test_strings.c | 10 +++++-----
src/service/hostlist/gnunet-daemon-hostlist_client.c | 4 ++--
src/service/transport/gnunet-service-transport.c | 7 -------
src/service/transport/test_communicator_basic.c | 4 ++--
9 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/contrib/gana b/contrib/gana
index f5577937d..ace673ed3 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit f5577937ddfe880a49c8bcfce6e531959d62fdd8
+Subproject commit ace673ed30067aa50ef5eebe16cc63ebe1ae066d
diff --git a/contrib/handbook b/contrib/handbook
index e5b42badb..2600551f4 160000
--- a/contrib/handbook
+++ b/contrib/handbook
@@ -1 +1 @@
-Subproject commit e5b42badb7450aee5367e70294a0f8b1595945eb
+Subproject commit 2600551f4246a3ef7402013ba285adcff61b92bc
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 261b50000..0a5df8e62 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -351,6 +351,7 @@
src/service/messenger/gnunet-service-messenger_message_state.c
src/service/messenger/gnunet-service-messenger_message_store.c
src/service/messenger/gnunet-service-messenger_operation.c
src/service/messenger/gnunet-service-messenger_operation_store.c
+src/service/messenger/gnunet-service-messenger_peer_store.c
src/service/messenger/gnunet-service-messenger_room.c
src/service/messenger/gnunet-service-messenger_service.c
src/service/messenger/gnunet-service-messenger_tunnel.c
@@ -365,7 +366,6 @@ src/service/messenger/messenger_api_handle.c
src/service/messenger/messenger_api_list_tunnels.c
src/service/messenger/messenger_api_message.c
src/service/messenger/messenger_api_message_kind.c
-src/service/messenger/messenger_api_peer_store.c
src/service/messenger/messenger_api_queue_messages.c
src/service/messenger/messenger_api_room.c
src/service/messenger/messenger_api_traits.c
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 85b67377b..9fa3de37d 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -675,7 +675,7 @@ GNUNET_log_skip (int n, int check_reset);
* @param logfile change logging to logfile (use NULL to keep stderr)
* @return #GNUNET_OK on success, #GNUNET_SYSERR if logfile could not be opened
*/
-int
+enum GNUNET_GenericReturnValue
GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile);
diff --git a/src/lib/util/gnunet_error_codes.c
b/src/lib/util/gnunet_error_codes.c
index 11ce2d0c8..c286f2e52 100644
--- a/src/lib/util/gnunet_error_codes.c
+++ b/src/lib/util/gnunet_error_codes.c
@@ -17,6 +17,7 @@
SPDX-License-Identifier: AGPL3.0-or-later
*/
+#include "platform.h"
#include "gnunet_error_codes.h"
#include <stddef.h>
#include <microhttpd.h>
diff --git a/src/lib/util/test_strings.c b/src/lib/util/test_strings.c
index e55741040..b39028f45 100644
--- a/src/lib/util/test_strings.c
+++ b/src/lib/util/test_strings.c
@@ -43,7 +43,7 @@
#define URLENCODE_TEST_VECTOR_PLAIN "Asbjlaw=ljsdlasjd?人aslkdsa"
#define URLENCODE_TEST_VECTOR_ENCODED \
- "Asbjlaw\%3Dljsdlasjd\%3F\%E4\%BA\%BAaslkdsa"
+ "Asbjlaw\%3Dljsdlasjd\%3F\%E4\%BA\%BAaslkdsa"
int
main (int argc, char *argv[])
@@ -156,10 +156,10 @@ main (int argc, char *argv[])
WANT (URLENCODE_TEST_VECTOR_ENCODED, b);
GNUNET_free (b);
GNUNET_assert (0 !=
- GNUNET_STRINGS_urldecode (strlen (
- URLENCODE_TEST_VECTOR_ENCODED),
- URLENCODE_TEST_VECTOR_ENCODED,
- &b));
+ GNUNET_STRINGS_urldecode (
+ URLENCODE_TEST_VECTOR_ENCODED,
+ strlen (URLENCODE_TEST_VECTOR_ENCODED),
+ &b));
WANT (URLENCODE_TEST_VECTOR_PLAIN, b);
GNUNET_free (b);
return 0;
diff --git a/src/service/hostlist/gnunet-daemon-hostlist_client.c
b/src/service/hostlist/gnunet-daemon-hostlist_client.c
index 2a03caaac..826f6b444 100644
--- a/src/service/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/service/hostlist/gnunet-daemon-hostlist_client.c
@@ -1041,9 +1041,9 @@ download_hostlist ()
}
CURL_EASY_SETOPT (curl, CURLOPT_FOLLOWLOCATION, 1);
CURL_EASY_SETOPT (curl,
- CURLOPT_REDIR_PROTOCOLS,
+ CURLOPT_REDIR_PROTOCOLS_STR,
CURLPROTO_HTTP | CURLPROTO_HTTPS);
- CURL_EASY_SETOPT (curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+ CURL_EASY_SETOPT (curl, CURLOPT_PROTOCOLS_STR, CURLPROTO_HTTP |
CURLPROTO_HTTPS);
CURL_EASY_SETOPT (curl, CURLOPT_MAXREDIRS, 4);
/* no need to abort if the above failed */
CURL_EASY_SETOPT (curl, CURLOPT_URL, current_url);
diff --git a/src/service/transport/gnunet-service-transport.c
b/src/service/transport/gnunet-service-transport.c
index f37abaae0..d61755890 100644
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@ -3135,8 +3135,6 @@ free_pending_message (struct PendingMessage *pm)
free_fragment_tree (pm);
if (NULL != pm->qe)
{
- struct QueueEntry *qe = pm->qe;
-
GNUNET_assert (pm == pm->qe->pm);
pm->qe->pm = NULL;
}
@@ -3291,9 +3289,6 @@ free_virtual_link (struct VirtualLink *vl)
static void
free_validation_state (struct ValidationState *vs)
{
- struct GNUNET_HashCode hkey;
- struct GNUNET_HashCode hc;
-
if (NULL != vs->revalidation_task)
{
GNUNET_SCHEDULER_cancel (vs->revalidation_task);
@@ -10927,8 +10922,6 @@ static void
validation_transmit_on_queue (struct Queue *q, struct ValidationState *vs)
{
struct TransportValidationChallengeMessage tvc;
- struct GNUNET_HashCode hkey;
- struct GNUNET_HashCode hc;
struct GNUNET_TIME_Absolute monotonic_time;
if (NULL != vs->revalidation_task)
diff --git a/src/service/transport/test_communicator_basic.c
b/src/service/transport/test_communicator_basic.c
index 52a4cf2c4..aa11ca5e0 100644
--- a/src/service/transport/test_communicator_basic.c
+++ b/src/service/transport/test_communicator_basic.c
@@ -394,7 +394,7 @@ process_statistics (void *cls,
ret = 2;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Not enough BOX messages! (want: %u, have %llu)\n",
- 9000, value);
+ 9000, (unsigned long long) value);
GNUNET_SCHEDULER_shutdown ();
}
if ((0 == strcmp ("rekey", test_name)) &&
@@ -406,7 +406,7 @@ process_statistics (void *cls,
ret = 2;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Not enough BOX messages! (want: %u, have %llu)\n",
- 6000, value);
+ 6000, (unsigned long long) value);
GNUNET_SCHEDULER_shutdown ();
}
return GNUNET_OK;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.