commit 2c709f49a4f9ab21293fc0160810d4dafa3c0ee6
parent 000d13da5f9a0aec36b261169f71c0c90a4129ab
Author: xrs <xrs@mail36.net>
Date: Sat, 7 Oct 2017 22:11:33 +0200
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat:
9 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/ats-tool/gnunet-ats.c b/src/ats-tool/gnunet-ats.c
@@ -872,8 +872,8 @@ run (void *cls,
for (c = 0; c < strlen (opt_type_str); c++)
{
- if (isupper (opt_type_str[c]))
- opt_type_str[c] = tolower (opt_type_str[c]);
+ if (isupper ((unsigned char) opt_type_str[c]))
+ opt_type_str[c] = tolower ((unsigned char) opt_type_str[c]);
}
if (0 == strcasecmp ("latency", opt_type_str))
@@ -974,7 +974,7 @@ main (int argc,
gettext_noop ("set preference for the given peer"),
&opt_set_pref),
- GNUNET_GETOPT_option_flag ('q',
+ GNUNET_GETOPT_option_flag ('q',
"quotas",
gettext_noop ("print all configured quotas"),
&opt_print_quotas),
diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c
@@ -179,7 +179,7 @@ GCPP_del_connection (struct CadetPeerPath *path,
GCC_2s (cc),
GCPP_2s (path),
off);
- GNUNET_assert (off < path->entries_length);
+ GNUNET_assert (off < path->entries_length); /* FIXME: This assertion fails sometimes! */
entry = path->entries[off];
GNUNET_assert (cc == entry->cc);
entry->cc = NULL;
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c
@@ -1091,7 +1091,7 @@ handle_command_string (char *message,
strlen (commands[i].command))))
i++;
ptr = &message[strlen (commands[i].command)];
- while (isspace ((int) *ptr))
+ while (isspace ((unsigned char) *ptr))
ptr++;
if ('\0' == *ptr)
ptr = NULL;
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c
@@ -975,6 +975,7 @@ GSC_SESSIONS_set_typemap (const struct GNUNET_PeerIdentity *peer,
session = find_session (peer);
if (NULL == session)
{
+ GSC_TYPEMAP_destroy (nmap);
GNUNET_break (0);
return;
}
diff --git a/src/dns/dnsparser.c b/src/dns/dnsparser.c
@@ -1278,8 +1278,8 @@ GNUNET_DNSPARSER_hex_to_bin (const char *hex,
in[2] = '\0';
for (off = 0; off < data_size; off++)
{
- in[0] = tolower ((int) hex[off * 2]);
- in[1] = tolower ((int) hex[off * 2 + 1]);
+ in[0] = tolower ((unsigned char) hex[off * 2]);
+ in[1] = tolower ((unsigned char) hex[off * 2 + 1]);
if (1 != sscanf (in, "%x", &h))
return off;
idata[off] = (uint8_t) h;
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
@@ -47,7 +47,7 @@ libgnunetsecretsharing_la_SOURCES = \
secretsharing_api.c \
secretsharing_common.c \
secretsharing.h
-libgnunetsecretsharing_la_LIBADD = \
+libgnunetsecretsharing_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(LIBGCRYPT_LIBS) \
$(LTLIBINTL)
diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c
@@ -281,7 +281,7 @@ exit_fail ()
* This also indicates the end of the connection to the service.
*/
static void
-host_left ()
+host_left (void *cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"The host has left the place.\n");
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
@@ -1051,7 +1051,7 @@ gen_topo_from_file (struct TopologyContext *tc,
state = PEER_INDEX;
while (offset < fs)
{
- if (0 != isspace (data[offset]))
+ if (0 != isspace ((unsigned char) data[offset]))
{
offset++;
continue;
diff --git a/src/topology/friends.c b/src/topology/friends.c
@@ -95,7 +95,7 @@ GNUNET_FRIENDS_parse (const struct GNUNET_CONFIGURATION_Handle *cfg,
pos = 0;
while (pos < fsize)
{
- while ((pos < fsize) && (! isspace ((int) data[pos])))
+ while ((pos < fsize) && (! isspace ((unsigned char) data[pos])))
pos++;
if (GNUNET_OK !=
GNUNET_CRYPTO_eddsa_public_key_from_string (&data[start],
