summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2020-10-16 10:54:49 +0200
committerMartin Schanzenbach <mschanzenbach@posteo.de>2020-10-16 10:54:49 +0200
commit30e8dd5bbe3ee00942e5f9aa303429249c8e9b3d (patch)
tree1cb2bc6072e623f33a103752527e8e000ae776b4
parent09c3455b2c3dd01e52ac2dd9c62c41b3ebcf8028 (diff)
-fix warnings except rps mess
-rw-r--r--src/cadet/gnunet-service-cadet_channel.c10
-rw-r--r--src/cadet/gnunet-service-cadet_core.c4
-rw-r--r--src/cadet/gnunet-service-cadet_dht.c4
-rw-r--r--src/cadet/gnunet-service-cadet_tunnels.c2
-rw-r--r--src/consensus/consensus_api.c2
-rw-r--r--src/dns/gnunet-dns-monitor.c2
-rw-r--r--src/fs/gnunet-daemon-fsprofiler.c4
-rw-r--r--src/peerinfo-tool/gnunet-peerinfo.c4
-rw-r--r--src/peerinfo-tool/plugin_rest_peerinfo.c4
-rw-r--r--src/regex/regex_block_lib.c8
-rw-r--r--src/regex/regex_internal_dht.c9
-rw-r--r--src/regex/regex_test_graph.c9
-rw-r--r--src/set/gnunet-service-set_union.c18
-rw-r--r--src/set/set_api.c3
-rw-r--r--src/setu/gnunet-service-setu.c18
15 files changed, 49 insertions, 52 deletions
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index dab53b8c4..ae6d21452 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -442,7 +442,7 @@ GCCH_2s (const struct CadetChannel *ch)
? "loopback"
: GNUNET_i2s (GCP_get_id (GCT_get_destination (ch->t))),
GNUNET_h2s (&ch->port),
- ch->ctn,
+ ch->ctn.cn,
(NULL == ch->owner)
? 0
: ntohl (ch->owner->ccn.channel_of_client),
@@ -1899,10 +1899,10 @@ GCCH_handle_local_data (struct CadetChannel *ch,
GNUNET_memcpy (&crm->data_message[1], buf, buf_len);
GNUNET_CONTAINER_DLL_insert_tail (ch->head_sent, ch->tail_sent, crm);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message %u from local client to %s with %u bytes\n",
+ "Sending message %u from local client to %s with %lu bytes\n",
ntohl (crm->data_message->mid.mid),
GCCH_2s (ch),
- buf_len);
+ (unsigned long) buf_len);
if (NULL != ch->retry_data_task)
{
GNUNET_SCHEDULER_cancel (ch->retry_data_task);
@@ -2044,7 +2044,7 @@ GCCH_debug (struct CadetChannel *ch, enum GNUNET_ErrorType level)
LOG2 (level, "CHN *** DEBUG NULL CHANNEL ***\n");
return;
}
- LOG2 (level, "CHN %s:%X (%p)\n", GCT_2s (ch->t), ch->ctn, ch);
+ LOG2 (level, "CHN %s:%X (%p)\n", GCT_2s (ch->t), ch->ctn.cn, ch);
if (NULL != ch->owner)
{
LOG2 (level,
@@ -2062,7 +2062,7 @@ GCCH_debug (struct CadetChannel *ch, enum GNUNET_ErrorType level)
ntohl (ch->dest->ccn.channel_of_client));
}
LOG2 (level,
- "CHN Message IDs recv: %d (%LLX), send: %d\n",
+ "CHN Message IDs recv: %d (%llX), send: %d\n",
ntohl (ch->mid_recv.mid),
(unsigned long long) ch->mid_futures,
ntohl (ch->mid_send.mid));
diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c
index 9a83fa31d..95a5d3f63 100644
--- a/src/cadet/gnunet-service-cadet_core.c
+++ b/src/cadet/gnunet-service-cadet_core.c
@@ -296,7 +296,7 @@ discard_all_from_rung_tail ()
while (NULL != (dir = tail->rd_head))
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Queue full due new message %s on connection %s, dropping old message\n",
+ "Queue full due new message on connection %s, dropping old message\n",
GNUNET_sh2s (&dir->my_route->cid.connection_of_tunnel));
GNUNET_STATISTICS_update (stats,
"# messages dropped due to full buffer",
@@ -408,7 +408,7 @@ route_message (struct CadetPeer *prev,
{
/* We are in the highest rung, drop our own! */
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Queue full due new message %s on connection %s, dropping old message\n",
+ "Queue full due new message on connection %s, dropping old message\n",
GNUNET_sh2s (&dir->my_route->cid.connection_of_tunnel));
GNUNET_STATISTICS_update (stats,
"# messages dropped due to full buffer",
diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/cadet/gnunet-service-cadet_dht.c
index 4e8ccbb08..e1bbeb2c3 100644
--- a/src/cadet/gnunet-service-cadet_dht.c
+++ b/src/cadet/gnunet-service-cadet_dht.c
@@ -195,8 +195,8 @@ announce_id (void *cls)
&my_full_id,
sizeof(my_full_id));
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Announcing my HELLO (%u bytes) in the DHT\n",
- size);
+ "Announcing my HELLO (%lu bytes) in the DHT\n",
+ (unsigned long) size);
GNUNET_DHT_put (dht_handle, /* DHT handle */
&phash, /* Key to use */
dht_replication_level, /* Replication level */
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c
index 2ca46b5aa..78bc54a5c 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -2431,7 +2431,7 @@ connection_ready_cb (void *cls,
{
case CADET_TUNNEL_KEY_UNINITIALIZED:
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Do not begin KX for %s if WE have no channels waiting. Retrying after %d\n",
+ "Do not begin KX for %s if WE have no channels waiting. Retrying after %llu\n",
GCT_2s (t),
GNUNET_TIME_absolute_get_remaining (t->next_kx_attempt).rel_value_us);
/* Do not begin KX if WE have no channels waiting! */
diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c
index 06b4c88ef..b4a9e5d39 100644
--- a/src/consensus/consensus_api.c
+++ b/src/consensus/consensus_api.c
@@ -280,7 +280,7 @@ GNUNET_CONSENSUS_insert (struct GNUNET_CONSENSUS_Handle *consensus,
struct GNUNET_MQ_Envelope *ev;
struct InsertDoneInfo *i;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "inserting, size=%llu\n", element->size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "inserting, size=%u\n", element->size);
ev = GNUNET_MQ_msg_extra (element_msg, element->size,
GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_INSERT);
diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c
index d9830baa4..836d65c79 100644
--- a/src/dns/gnunet-dns-monitor.c
+++ b/src/dns/gnunet-dns-monitor.c
@@ -203,7 +203,7 @@ display_record (const struct GNUNET_DNSPARSER_Record *record)
else
{
GNUNET_asprintf (&tmp,
- "priority %u, weight = %s, port = %u, target = %s",
+ "priority %u, weight = %u, port = %u, target = %s",
(unsigned int) record->data.srv->priority,
(unsigned int) record->data.srv->weight,
(unsigned int) record->data.srv->port,
diff --git a/src/fs/gnunet-daemon-fsprofiler.c b/src/fs/gnunet-daemon-fsprofiler.c
index 829906461..fbb7c6028 100644
--- a/src/fs/gnunet-daemon-fsprofiler.c
+++ b/src/fs/gnunet-daemon-fsprofiler.c
@@ -592,14 +592,14 @@ run (void *cls, char *const *args GNUNET_UNUSED,
&replication_level))
replication_level = 1;
GNUNET_snprintf (myoptname, sizeof(myoptname),
- "DOWNLOAD-PATTERN-%u", my_peerid);
+ "DOWNLOAD-PATTERN-%llu", my_peerid);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
"FSPROFILER", myoptname,
&download_pattern))
download_pattern = GNUNET_strdup ("");
GNUNET_snprintf (myoptname, sizeof(myoptname),
- "PUBLISH-PATTERN-%u", my_peerid);
+ "PUBLISH-PATTERN-%llu", my_peerid);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
"FSPROFILER", myoptname,
diff --git a/src/peerinfo-tool/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c
index 739249a93..987c7c3a0 100644
--- a/src/peerinfo-tool/gnunet-peerinfo.c
+++ b/src/peerinfo-tool/gnunet-peerinfo.c
@@ -338,9 +338,9 @@ print_address (void *cls,
ar->pc = pc;
ar->expiration = expiration;
GNUNET_asprintf (&ar->result,
- "%s:%u:%u",
+ "%s:%lu:%u",
address->transport_name,
- address->address_length,
+ (unsigned long) address->address_length,
address->local_info);
ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg,
address,
diff --git a/src/peerinfo-tool/plugin_rest_peerinfo.c b/src/peerinfo-tool/plugin_rest_peerinfo.c
index 99cec7e58..4bbc7442e 100644
--- a/src/peerinfo-tool/plugin_rest_peerinfo.c
+++ b/src/peerinfo-tool/plugin_rest_peerinfo.c
@@ -554,9 +554,9 @@ print_address (void *cls,
ar->pc = pc;
ar->expiration = expiration;
GNUNET_asprintf (&ar->result,
- "%s:%u:%u",
+ "%s:%lu:%u",
address->transport_name,
- address->address_length,
+ (unsigned long) address->address_length,
address->local_info);
ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg,
address,
diff --git a/src/regex/regex_block_lib.c b/src/regex/regex_block_lib.c
index a309c2305..159e8bf8a 100644
--- a/src/regex/regex_block_lib.c
+++ b/src/regex/regex_block_lib.c
@@ -352,14 +352,14 @@ REGEX_BLOCK_iterate (const struct RegexBlock *block,
}
off = len;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Start iterating block of size %u, proof %u, off %u edges %u\n",
- size, len, off, n);
+ "Start iterating block of size %lu, proof %u, off %lu edges %u\n",
+ (unsigned long) size, len, (unsigned long) off, n);
/* &aux[off] always points to our token */
for (n = 0; n < num_edges; n++)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Edge %u/%u, off %u tokenlen %u (%.*s)\n",
- n + 1, num_edges, off,
+ "Edge %u/%u, off %lu tokenlen %u (%.*s)\n",
+ n + 1, num_edges, (unsigned long) off,
ntohs (edges[n].token_length), ntohs (edges[n].token_length),
&aux[off]);
if (NULL != iterator)
diff --git a/src/regex/regex_internal_dht.c b/src/regex/regex_internal_dht.c
index d2c69f131..39d7cd847 100644
--- a/src/regex/regex_internal_dht.c
+++ b/src/regex/regex_internal_dht.c
@@ -427,8 +427,7 @@ regex_find_path (const struct GNUNET_HashCode *key,
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Accept state found, now searching for paths to %s\n",
- GNUNET_h2s (key),
- (unsigned int) ctx->position);
+ GNUNET_h2s (key));
get_h = GNUNET_DHT_get_start (ctx->info->dht, /* handle */
GNUNET_BLOCK_TYPE_REGEX_ACCEPT, /* type */
key, /* key to search */
@@ -534,8 +533,8 @@ regex_result_iterator (void *cls,
return GNUNET_YES; // We found an accept state!
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "* %u, %u, [%u]\n",
- ctx->position,
+ "* %lu, %lu, [%u]\n",
+ (unsigned long) ctx->position,
strlen (ctx->info->description),
GNUNET_BLOCK_is_accepting (block, result->size));
regex_next_edge (block, result->size, ctx);
@@ -729,7 +728,7 @@ REGEX_INTERNAL_search (struct GNUNET_DHT_Handle *dht,
"Initial key for `%s' is %s (based on `%.*s')\n",
string,
GNUNET_h2s (&key),
- size,
+ (int) size,
string);
ctx = GNUNET_new (struct RegexSearchContext);
ctx->position = size;
diff --git a/src/regex/regex_test_graph.c b/src/regex/regex_test_graph.c
index 8e1e00fd4..c8efae772 100644
--- a/src/regex/regex_test_graph.c
+++ b/src/regex/regex_test_graph.c
@@ -177,8 +177,7 @@ REGEX_TEST_automaton_save_graph_step (void *cls, unsigned int count,
}
else
{
- GNUNET_asprintf (&s_acc, "\"%s\" [shape=doublecircle];\n", name,
- s->scc_id);
+ GNUNET_asprintf (&s_acc, "\"%s\" [shape=doublecircle];\n", name);
}
}
else if (GNUNET_YES == ctx->coloring)
@@ -189,7 +188,7 @@ REGEX_TEST_automaton_save_graph_step (void *cls, unsigned int count,
}
else
{
- GNUNET_asprintf (&s_acc, "\"%s\" [shape=circle];\n", name, s->scc_id);
+ GNUNET_asprintf (&s_acc, "\"%s\" [shape=circle];\n", name);
}
GNUNET_assert (NULL != s_acc);
@@ -228,7 +227,7 @@ REGEX_TEST_automaton_save_graph_step (void *cls, unsigned int count,
else
{
GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"ε\"];\n", name,
- to_name, s->scc_id);
+ to_name);
}
}
else
@@ -242,7 +241,7 @@ REGEX_TEST_automaton_save_graph_step (void *cls, unsigned int count,
else
{
GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"%s\"];\n", name,
- to_name, ctran->label, s->scc_id);
+ to_name, ctran->label);
}
}
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 87c6faf98..931d7e753 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -563,8 +563,8 @@ prepare_ibf_iterator (void *cls,
struct IBF_Key salted_key;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "[OP %x] inserting %lx (hash %s) into ibf\n",
- (void *) op,
+ "[OP %p] inserting %lx (hash %s) into ibf\n",
+ op,
(unsigned long) ke->ibf_key.key_val,
GNUNET_h2s (&ke->element->element_hash));
salt_key (&ke->ibf_key,
@@ -929,7 +929,7 @@ handle_union_p2p_strata_estimator (void *cls,
(0 == other_size))
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Deciding to go for full set transmission (diff=%d, own set=%u)\n",
+ "Deciding to go for full set transmission (diff=%d, own set=%llu)\n",
diff,
op->state->initial_size);
GNUNET_STATISTICS_update (_GSS_statistics,
@@ -1004,8 +1004,8 @@ send_offers_iterator (void *cls,
GNUNET_assert (NULL != ev);
*(struct GNUNET_HashCode *) &mh[1] = ke->element->element_hash;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "[OP %x] sending element offer (%s) to peer\n",
- (void *) op,
+ "[OP %p] sending element offer (%s) to peer\n",
+ op,
GNUNET_h2s (&ke->element->element_hash));
GNUNET_MQ_send (op->mq, ev);
return GNUNET_YES;
@@ -2004,8 +2004,8 @@ handle_union_p2p_demand (void *cls,
emsg->reserved = htons (0);
emsg->element_type = htons (ee->element.element_type);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "[OP %x] Sending demanded element (size %u, hash %s) to peer\n",
- (void *) op,
+ "[OP %p] Sending demanded element (size %u, hash %s) to peer\n",
+ op,
(unsigned int) ee->element.size,
GNUNET_h2s (&ee->element_hash));
GNUNET_MQ_send (op->mq, ev);
@@ -2120,8 +2120,8 @@ handle_union_p2p_offer (void *cls,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "[OP %x] Requesting element (hash %s)\n",
- (void *) op, GNUNET_h2s (hash));
+ "[OP %p] Requesting element (hash %s)\n",
+ op, GNUNET_h2s (hash));
ev = GNUNET_MQ_msg_header_extra (demands,
sizeof(struct GNUNET_HashCode),
GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DEMAND);
diff --git a/src/set/set_api.c b/src/set/set_api.c
index ce4b1c965..a082c23c1 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -630,8 +630,7 @@ create_internal (const struct GNUNET_CONFIGURATION_Handle *cfg,
else
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Creating new set (lazy copy)\n",
- op);
+ "Creating new set (lazy copy)\n");
mqm = GNUNET_MQ_msg (copy_msg,
GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_CONNECT);
copy_msg->cookie = *cookie;
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index 326589186..30f02ecac 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -1049,8 +1049,8 @@ prepare_ibf_iterator (void *cls,
struct IBF_Key salted_key;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "[OP %x] inserting %lx (hash %s) into ibf\n",
- (void *) op,
+ "[OP %p] inserting %lx (hash %s) into ibf\n",
+ op,
(unsigned long) ke->ibf_key.key_val,
GNUNET_h2s (&ke->element->element_hash));
salt_key (&ke->ibf_key,
@@ -1429,7 +1429,7 @@ handle_union_p2p_strata_estimator (void *cls,
(0 == other_size))
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Deciding to go for full set transmission (diff=%d, own set=%u)\n",
+ "Deciding to go for full set transmission (diff=%d, own set=%llu)\n",
diff,
op->initial_size);
GNUNET_STATISTICS_update (_GSS_statistics,
@@ -1504,8 +1504,8 @@ send_offers_iterator (void *cls,
GNUNET_assert (NULL != ev);
*(struct GNUNET_HashCode *) &mh[1] = ke->element->element_hash;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "[OP %x] sending element offer (%s) to peer\n",
- (void *) op,
+ "[OP %p] sending element offer (%s) to peer\n",
+ op,
GNUNET_h2s (&ke->element->element_hash));
GNUNET_MQ_send (op->mq, ev);
return GNUNET_YES;
@@ -2403,8 +2403,8 @@ handle_union_p2p_demand (void *cls,
emsg->reserved = htons (0);
emsg->element_type = htons (ee->element.element_type);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "[OP %x] Sending demanded element (size %u, hash %s) to peer\n",
- (void *) op,
+ "[OP %p] Sending demanded element (size %u, hash %s) to peer\n",
+ op,
(unsigned int) ee->element.size,
GNUNET_h2s (&ee->element_hash));
GNUNET_MQ_send (op->mq, ev);
@@ -2502,8 +2502,8 @@ handle_union_p2p_offer (void *cls,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "[OP %x] Requesting element (hash %s)\n",
- (void *) op, GNUNET_h2s (hash));
+ "[OP %p] Requesting element (hash %s)\n",
+ op, GNUNET_h2s (hash));
ev = GNUNET_MQ_msg_header_extra (demands,
sizeof(struct GNUNET_HashCode),
GNUNET_MESSAGE_TYPE_SETU_P2P_DEMAND);