aboutsummaryrefslogtreecommitdiff
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)
downloadgnunet-30e8dd5bbe3ee00942e5f9aa303429249c8e9b3d.tar.gz
gnunet-30e8dd5bbe3ee00942e5f9aa303429249c8e9b3d.zip
-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)
442 ? "loopback" 442 ? "loopback"
443 : GNUNET_i2s (GCP_get_id (GCT_get_destination (ch->t))), 443 : GNUNET_i2s (GCP_get_id (GCT_get_destination (ch->t))),
444 GNUNET_h2s (&ch->port), 444 GNUNET_h2s (&ch->port),
445 ch->ctn, 445 ch->ctn.cn,
446 (NULL == ch->owner) 446 (NULL == ch->owner)
447 ? 0 447 ? 0
448 : ntohl (ch->owner->ccn.channel_of_client), 448 : ntohl (ch->owner->ccn.channel_of_client),
@@ -1899,10 +1899,10 @@ GCCH_handle_local_data (struct CadetChannel *ch,
1899 GNUNET_memcpy (&crm->data_message[1], buf, buf_len); 1899 GNUNET_memcpy (&crm->data_message[1], buf, buf_len);
1900 GNUNET_CONTAINER_DLL_insert_tail (ch->head_sent, ch->tail_sent, crm); 1900 GNUNET_CONTAINER_DLL_insert_tail (ch->head_sent, ch->tail_sent, crm);
1901 LOG (GNUNET_ERROR_TYPE_DEBUG, 1901 LOG (GNUNET_ERROR_TYPE_DEBUG,
1902 "Sending message %u from local client to %s with %u bytes\n", 1902 "Sending message %u from local client to %s with %lu bytes\n",
1903 ntohl (crm->data_message->mid.mid), 1903 ntohl (crm->data_message->mid.mid),
1904 GCCH_2s (ch), 1904 GCCH_2s (ch),
1905 buf_len); 1905 (unsigned long) buf_len);
1906 if (NULL != ch->retry_data_task) 1906 if (NULL != ch->retry_data_task)
1907 { 1907 {
1908 GNUNET_SCHEDULER_cancel (ch->retry_data_task); 1908 GNUNET_SCHEDULER_cancel (ch->retry_data_task);
@@ -2044,7 +2044,7 @@ GCCH_debug (struct CadetChannel *ch, enum GNUNET_ErrorType level)
2044 LOG2 (level, "CHN *** DEBUG NULL CHANNEL ***\n"); 2044 LOG2 (level, "CHN *** DEBUG NULL CHANNEL ***\n");
2045 return; 2045 return;
2046 } 2046 }
2047 LOG2 (level, "CHN %s:%X (%p)\n", GCT_2s (ch->t), ch->ctn, ch); 2047 LOG2 (level, "CHN %s:%X (%p)\n", GCT_2s (ch->t), ch->ctn.cn, ch);
2048 if (NULL != ch->owner) 2048 if (NULL != ch->owner)
2049 { 2049 {
2050 LOG2 (level, 2050 LOG2 (level,
@@ -2062,7 +2062,7 @@ GCCH_debug (struct CadetChannel *ch, enum GNUNET_ErrorType level)
2062 ntohl (ch->dest->ccn.channel_of_client)); 2062 ntohl (ch->dest->ccn.channel_of_client));
2063 } 2063 }
2064 LOG2 (level, 2064 LOG2 (level,
2065 "CHN Message IDs recv: %d (%LLX), send: %d\n", 2065 "CHN Message IDs recv: %d (%llX), send: %d\n",
2066 ntohl (ch->mid_recv.mid), 2066 ntohl (ch->mid_recv.mid),
2067 (unsigned long long) ch->mid_futures, 2067 (unsigned long long) ch->mid_futures,
2068 ntohl (ch->mid_send.mid)); 2068 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 ()
296 while (NULL != (dir = tail->rd_head)) 296 while (NULL != (dir = tail->rd_head))
297 { 297 {
298 LOG (GNUNET_ERROR_TYPE_DEBUG, 298 LOG (GNUNET_ERROR_TYPE_DEBUG,
299 "Queue full due new message %s on connection %s, dropping old message\n", 299 "Queue full due new message on connection %s, dropping old message\n",
300 GNUNET_sh2s (&dir->my_route->cid.connection_of_tunnel)); 300 GNUNET_sh2s (&dir->my_route->cid.connection_of_tunnel));
301 GNUNET_STATISTICS_update (stats, 301 GNUNET_STATISTICS_update (stats,
302 "# messages dropped due to full buffer", 302 "# messages dropped due to full buffer",
@@ -408,7 +408,7 @@ route_message (struct CadetPeer *prev,
408 { 408 {
409 /* We are in the highest rung, drop our own! */ 409 /* We are in the highest rung, drop our own! */
410 LOG (GNUNET_ERROR_TYPE_DEBUG, 410 LOG (GNUNET_ERROR_TYPE_DEBUG,
411 "Queue full due new message %s on connection %s, dropping old message\n", 411 "Queue full due new message on connection %s, dropping old message\n",
412 GNUNET_sh2s (&dir->my_route->cid.connection_of_tunnel)); 412 GNUNET_sh2s (&dir->my_route->cid.connection_of_tunnel));
413 GNUNET_STATISTICS_update (stats, 413 GNUNET_STATISTICS_update (stats,
414 "# messages dropped due to full buffer", 414 "# 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)
195 &my_full_id, 195 &my_full_id,
196 sizeof(my_full_id)); 196 sizeof(my_full_id));
197 LOG (GNUNET_ERROR_TYPE_DEBUG, 197 LOG (GNUNET_ERROR_TYPE_DEBUG,
198 "Announcing my HELLO (%u bytes) in the DHT\n", 198 "Announcing my HELLO (%lu bytes) in the DHT\n",
199 size); 199 (unsigned long) size);
200 GNUNET_DHT_put (dht_handle, /* DHT handle */ 200 GNUNET_DHT_put (dht_handle, /* DHT handle */
201 &phash, /* Key to use */ 201 &phash, /* Key to use */
202 dht_replication_level, /* Replication level */ 202 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,
2431 { 2431 {
2432 case CADET_TUNNEL_KEY_UNINITIALIZED: 2432 case CADET_TUNNEL_KEY_UNINITIALIZED:
2433 LOG (GNUNET_ERROR_TYPE_DEBUG, 2433 LOG (GNUNET_ERROR_TYPE_DEBUG,
2434 "Do not begin KX for %s if WE have no channels waiting. Retrying after %d\n", 2434 "Do not begin KX for %s if WE have no channels waiting. Retrying after %llu\n",
2435 GCT_2s (t), 2435 GCT_2s (t),
2436 GNUNET_TIME_absolute_get_remaining (t->next_kx_attempt).rel_value_us); 2436 GNUNET_TIME_absolute_get_remaining (t->next_kx_attempt).rel_value_us);
2437 /* Do not begin KX if WE have no channels waiting! */ 2437 /* 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,
280 struct GNUNET_MQ_Envelope *ev; 280 struct GNUNET_MQ_Envelope *ev;
281 struct InsertDoneInfo *i; 281 struct InsertDoneInfo *i;
282 282
283 LOG (GNUNET_ERROR_TYPE_DEBUG, "inserting, size=%llu\n", element->size); 283 LOG (GNUNET_ERROR_TYPE_DEBUG, "inserting, size=%u\n", element->size);
284 284
285 ev = GNUNET_MQ_msg_extra (element_msg, element->size, 285 ev = GNUNET_MQ_msg_extra (element_msg, element->size,
286 GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_INSERT); 286 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)
203 else 203 else
204 { 204 {
205 GNUNET_asprintf (&tmp, 205 GNUNET_asprintf (&tmp,
206 "priority %u, weight = %s, port = %u, target = %s", 206 "priority %u, weight = %u, port = %u, target = %s",
207 (unsigned int) record->data.srv->priority, 207 (unsigned int) record->data.srv->priority,
208 (unsigned int) record->data.srv->weight, 208 (unsigned int) record->data.srv->weight,
209 (unsigned int) record->data.srv->port, 209 (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,
592 &replication_level)) 592 &replication_level))
593 replication_level = 1; 593 replication_level = 1;
594 GNUNET_snprintf (myoptname, sizeof(myoptname), 594 GNUNET_snprintf (myoptname, sizeof(myoptname),
595 "DOWNLOAD-PATTERN-%u", my_peerid); 595 "DOWNLOAD-PATTERN-%llu", my_peerid);
596 if (GNUNET_OK != 596 if (GNUNET_OK !=
597 GNUNET_CONFIGURATION_get_value_string (cfg, 597 GNUNET_CONFIGURATION_get_value_string (cfg,
598 "FSPROFILER", myoptname, 598 "FSPROFILER", myoptname,
599 &download_pattern)) 599 &download_pattern))
600 download_pattern = GNUNET_strdup (""); 600 download_pattern = GNUNET_strdup ("");
601 GNUNET_snprintf (myoptname, sizeof(myoptname), 601 GNUNET_snprintf (myoptname, sizeof(myoptname),
602 "PUBLISH-PATTERN-%u", my_peerid); 602 "PUBLISH-PATTERN-%llu", my_peerid);
603 if (GNUNET_OK != 603 if (GNUNET_OK !=
604 GNUNET_CONFIGURATION_get_value_string (cfg, 604 GNUNET_CONFIGURATION_get_value_string (cfg,
605 "FSPROFILER", myoptname, 605 "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,
338 ar->pc = pc; 338 ar->pc = pc;
339 ar->expiration = expiration; 339 ar->expiration = expiration;
340 GNUNET_asprintf (&ar->result, 340 GNUNET_asprintf (&ar->result,
341 "%s:%u:%u", 341 "%s:%lu:%u",
342 address->transport_name, 342 address->transport_name,
343 address->address_length, 343 (unsigned long) address->address_length,
344 address->local_info); 344 address->local_info);
345 ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg, 345 ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg,
346 address, 346 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,
554 ar->pc = pc; 554 ar->pc = pc;
555 ar->expiration = expiration; 555 ar->expiration = expiration;
556 GNUNET_asprintf (&ar->result, 556 GNUNET_asprintf (&ar->result,
557 "%s:%u:%u", 557 "%s:%lu:%u",
558 address->transport_name, 558 address->transport_name,
559 address->address_length, 559 (unsigned long) address->address_length,
560 address->local_info); 560 address->local_info);
561 ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg, 561 ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg,
562 address, 562 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,
352 } 352 }
353 off = len; 353 off = len;
354 LOG (GNUNET_ERROR_TYPE_DEBUG, 354 LOG (GNUNET_ERROR_TYPE_DEBUG,
355 "Start iterating block of size %u, proof %u, off %u edges %u\n", 355 "Start iterating block of size %lu, proof %u, off %lu edges %u\n",
356 size, len, off, n); 356 (unsigned long) size, len, (unsigned long) off, n);
357 /* &aux[off] always points to our token */ 357 /* &aux[off] always points to our token */
358 for (n = 0; n < num_edges; n++) 358 for (n = 0; n < num_edges; n++)
359 { 359 {
360 LOG (GNUNET_ERROR_TYPE_DEBUG, 360 LOG (GNUNET_ERROR_TYPE_DEBUG,
361 "Edge %u/%u, off %u tokenlen %u (%.*s)\n", 361 "Edge %u/%u, off %lu tokenlen %u (%.*s)\n",
362 n + 1, num_edges, off, 362 n + 1, num_edges, (unsigned long) off,
363 ntohs (edges[n].token_length), ntohs (edges[n].token_length), 363 ntohs (edges[n].token_length), ntohs (edges[n].token_length),
364 &aux[off]); 364 &aux[off]);
365 if (NULL != iterator) 365 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,
427 427
428 LOG (GNUNET_ERROR_TYPE_DEBUG, 428 LOG (GNUNET_ERROR_TYPE_DEBUG,
429 "Accept state found, now searching for paths to %s\n", 429 "Accept state found, now searching for paths to %s\n",
430 GNUNET_h2s (key), 430 GNUNET_h2s (key));
431 (unsigned int) ctx->position);
432 get_h = GNUNET_DHT_get_start (ctx->info->dht, /* handle */ 431 get_h = GNUNET_DHT_get_start (ctx->info->dht, /* handle */
433 GNUNET_BLOCK_TYPE_REGEX_ACCEPT, /* type */ 432 GNUNET_BLOCK_TYPE_REGEX_ACCEPT, /* type */
434 key, /* key to search */ 433 key, /* key to search */
@@ -534,8 +533,8 @@ regex_result_iterator (void *cls,
534 return GNUNET_YES; // We found an accept state! 533 return GNUNET_YES; // We found an accept state!
535 } 534 }
536 LOG (GNUNET_ERROR_TYPE_DEBUG, 535 LOG (GNUNET_ERROR_TYPE_DEBUG,
537 "* %u, %u, [%u]\n", 536 "* %lu, %lu, [%u]\n",
538 ctx->position, 537 (unsigned long) ctx->position,
539 strlen (ctx->info->description), 538 strlen (ctx->info->description),
540 GNUNET_BLOCK_is_accepting (block, result->size)); 539 GNUNET_BLOCK_is_accepting (block, result->size));
541 regex_next_edge (block, result->size, ctx); 540 regex_next_edge (block, result->size, ctx);
@@ -729,7 +728,7 @@ REGEX_INTERNAL_search (struct GNUNET_DHT_Handle *dht,
729 "Initial key for `%s' is %s (based on `%.*s')\n", 728 "Initial key for `%s' is %s (based on `%.*s')\n",
730 string, 729 string,
731 GNUNET_h2s (&key), 730 GNUNET_h2s (&key),
732 size, 731 (int) size,
733 string); 732 string);
734 ctx = GNUNET_new (struct RegexSearchContext); 733 ctx = GNUNET_new (struct RegexSearchContext);
735 ctx->position = size; 734 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,
177 } 177 }
178 else 178 else
179 { 179 {
180 GNUNET_asprintf (&s_acc, "\"%s\" [shape=doublecircle];\n", name, 180 GNUNET_asprintf (&s_acc, "\"%s\" [shape=doublecircle];\n", name);
181 s->scc_id);
182 } 181 }
183 } 182 }
184 else if (GNUNET_YES == ctx->coloring) 183 else if (GNUNET_YES == ctx->coloring)
@@ -189,7 +188,7 @@ REGEX_TEST_automaton_save_graph_step (void *cls, unsigned int count,
189 } 188 }
190 else 189 else
191 { 190 {
192 GNUNET_asprintf (&s_acc, "\"%s\" [shape=circle];\n", name, s->scc_id); 191 GNUNET_asprintf (&s_acc, "\"%s\" [shape=circle];\n", name);
193 } 192 }
194 193
195 GNUNET_assert (NULL != s_acc); 194 GNUNET_assert (NULL != s_acc);
@@ -228,7 +227,7 @@ REGEX_TEST_automaton_save_graph_step (void *cls, unsigned int count,
228 else 227 else
229 { 228 {
230 GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"ε\"];\n", name, 229 GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"ε\"];\n", name,
231 to_name, s->scc_id); 230 to_name);
232 } 231 }
233 } 232 }
234 else 233 else
@@ -242,7 +241,7 @@ REGEX_TEST_automaton_save_graph_step (void *cls, unsigned int count,
242 else 241 else
243 { 242 {
244 GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"%s\"];\n", name, 243 GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"%s\"];\n", name,
245 to_name, ctran->label, s->scc_id); 244 to_name, ctran->label);
246 } 245 }
247 } 246 }
248 247
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,
563 struct IBF_Key salted_key; 563 struct IBF_Key salted_key;
564 564
565 LOG (GNUNET_ERROR_TYPE_DEBUG, 565 LOG (GNUNET_ERROR_TYPE_DEBUG,
566 "[OP %x] inserting %lx (hash %s) into ibf\n", 566 "[OP %p] inserting %lx (hash %s) into ibf\n",
567 (void *) op, 567 op,
568 (unsigned long) ke->ibf_key.key_val, 568 (unsigned long) ke->ibf_key.key_val,
569 GNUNET_h2s (&ke->element->element_hash)); 569 GNUNET_h2s (&ke->element->element_hash));
570 salt_key (&ke->ibf_key, 570 salt_key (&ke->ibf_key,
@@ -929,7 +929,7 @@ handle_union_p2p_strata_estimator (void *cls,
929 (0 == other_size)) 929 (0 == other_size))
930 { 930 {
931 LOG (GNUNET_ERROR_TYPE_DEBUG, 931 LOG (GNUNET_ERROR_TYPE_DEBUG,
932 "Deciding to go for full set transmission (diff=%d, own set=%u)\n", 932 "Deciding to go for full set transmission (diff=%d, own set=%llu)\n",
933 diff, 933 diff,
934 op->state->initial_size); 934 op->state->initial_size);
935 GNUNET_STATISTICS_update (_GSS_statistics, 935 GNUNET_STATISTICS_update (_GSS_statistics,
@@ -1004,8 +1004,8 @@ send_offers_iterator (void *cls,
1004 GNUNET_assert (NULL != ev); 1004 GNUNET_assert (NULL != ev);
1005 *(struct GNUNET_HashCode *) &mh[1] = ke->element->element_hash; 1005 *(struct GNUNET_HashCode *) &mh[1] = ke->element->element_hash;
1006 LOG (GNUNET_ERROR_TYPE_DEBUG, 1006 LOG (GNUNET_ERROR_TYPE_DEBUG,
1007 "[OP %x] sending element offer (%s) to peer\n", 1007 "[OP %p] sending element offer (%s) to peer\n",
1008 (void *) op, 1008 op,
1009 GNUNET_h2s (&ke->element->element_hash)); 1009 GNUNET_h2s (&ke->element->element_hash));
1010 GNUNET_MQ_send (op->mq, ev); 1010 GNUNET_MQ_send (op->mq, ev);
1011 return GNUNET_YES; 1011 return GNUNET_YES;
@@ -2004,8 +2004,8 @@ handle_union_p2p_demand (void *cls,
2004 emsg->reserved = htons (0); 2004 emsg->reserved = htons (0);
2005 emsg->element_type = htons (ee->element.element_type); 2005 emsg->element_type = htons (ee->element.element_type);
2006 LOG (GNUNET_ERROR_TYPE_DEBUG, 2006 LOG (GNUNET_ERROR_TYPE_DEBUG,
2007 "[OP %x] Sending demanded element (size %u, hash %s) to peer\n", 2007 "[OP %p] Sending demanded element (size %u, hash %s) to peer\n",
2008 (void *) op, 2008 op,
2009 (unsigned int) ee->element.size, 2009 (unsigned int) ee->element.size,
2010 GNUNET_h2s (&ee->element_hash)); 2010 GNUNET_h2s (&ee->element_hash));
2011 GNUNET_MQ_send (op->mq, ev); 2011 GNUNET_MQ_send (op->mq, ev);
@@ -2120,8 +2120,8 @@ handle_union_p2p_offer (void *cls,
2120 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); 2120 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
2121 2121
2122 LOG (GNUNET_ERROR_TYPE_DEBUG, 2122 LOG (GNUNET_ERROR_TYPE_DEBUG,
2123 "[OP %x] Requesting element (hash %s)\n", 2123 "[OP %p] Requesting element (hash %s)\n",
2124 (void *) op, GNUNET_h2s (hash)); 2124 op, GNUNET_h2s (hash));
2125 ev = GNUNET_MQ_msg_header_extra (demands, 2125 ev = GNUNET_MQ_msg_header_extra (demands,
2126 sizeof(struct GNUNET_HashCode), 2126 sizeof(struct GNUNET_HashCode),
2127 GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DEMAND); 2127 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,
630 else 630 else
631 { 631 {
632 LOG (GNUNET_ERROR_TYPE_DEBUG, 632 LOG (GNUNET_ERROR_TYPE_DEBUG,
633 "Creating new set (lazy copy)\n", 633 "Creating new set (lazy copy)\n");
634 op);
635 mqm = GNUNET_MQ_msg (copy_msg, 634 mqm = GNUNET_MQ_msg (copy_msg,
636 GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_CONNECT); 635 GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_CONNECT);
637 copy_msg->cookie = *cookie; 636 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,
1049 struct IBF_Key salted_key; 1049 struct IBF_Key salted_key;
1050 1050
1051 LOG (GNUNET_ERROR_TYPE_DEBUG, 1051 LOG (GNUNET_ERROR_TYPE_DEBUG,
1052 "[OP %x] inserting %lx (hash %s) into ibf\n", 1052 "[OP %p] inserting %lx (hash %s) into ibf\n",
1053 (void *) op, 1053 op,
1054 (unsigned long) ke->ibf_key.key_val, 1054 (unsigned long) ke->ibf_key.key_val,
1055 GNUNET_h2s (&ke->element->element_hash)); 1055 GNUNET_h2s (&ke->element->element_hash));
1056 salt_key (&ke->ibf_key, 1056 salt_key (&ke->ibf_key,
@@ -1429,7 +1429,7 @@ handle_union_p2p_strata_estimator (void *cls,
1429 (0 == other_size)) 1429 (0 == other_size))
1430 { 1430 {
1431 LOG (GNUNET_ERROR_TYPE_DEBUG, 1431 LOG (GNUNET_ERROR_TYPE_DEBUG,
1432 "Deciding to go for full set transmission (diff=%d, own set=%u)\n", 1432 "Deciding to go for full set transmission (diff=%d, own set=%llu)\n",
1433 diff, 1433 diff,
1434 op->initial_size); 1434 op->initial_size);
1435 GNUNET_STATISTICS_update (_GSS_statistics, 1435 GNUNET_STATISTICS_update (_GSS_statistics,
@@ -1504,8 +1504,8 @@ send_offers_iterator (void *cls,
1504 GNUNET_assert (NULL != ev); 1504 GNUNET_assert (NULL != ev);
1505 *(struct GNUNET_HashCode *) &mh[1] = ke->element->element_hash; 1505 *(struct GNUNET_HashCode *) &mh[1] = ke->element->element_hash;
1506 LOG (GNUNET_ERROR_TYPE_DEBUG, 1506 LOG (GNUNET_ERROR_TYPE_DEBUG,
1507 "[OP %x] sending element offer (%s) to peer\n", 1507 "[OP %p] sending element offer (%s) to peer\n",
1508 (void *) op, 1508 op,
1509 GNUNET_h2s (&ke->element->element_hash)); 1509 GNUNET_h2s (&ke->element->element_hash));
1510 GNUNET_MQ_send (op->mq, ev); 1510 GNUNET_MQ_send (op->mq, ev);
1511 return GNUNET_YES; 1511 return GNUNET_YES;
@@ -2403,8 +2403,8 @@ handle_union_p2p_demand (void *cls,
2403 emsg->reserved = htons (0); 2403 emsg->reserved = htons (0);
2404 emsg->element_type = htons (ee->element.element_type); 2404 emsg->element_type = htons (ee->element.element_type);
2405 LOG (GNUNET_ERROR_TYPE_DEBUG, 2405 LOG (GNUNET_ERROR_TYPE_DEBUG,
2406 "[OP %x] Sending demanded element (size %u, hash %s) to peer\n", 2406 "[OP %p] Sending demanded element (size %u, hash %s) to peer\n",
2407 (void *) op, 2407 op,
2408 (unsigned int) ee->element.size, 2408 (unsigned int) ee->element.size,
2409 GNUNET_h2s (&ee->element_hash)); 2409 GNUNET_h2s (&ee->element_hash));
2410 GNUNET_MQ_send (op->mq, ev); 2410 GNUNET_MQ_send (op->mq, ev);
@@ -2502,8 +2502,8 @@ handle_union_p2p_offer (void *cls,
2502 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); 2502 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
2503 2503
2504 LOG (GNUNET_ERROR_TYPE_DEBUG, 2504 LOG (GNUNET_ERROR_TYPE_DEBUG,
2505 "[OP %x] Requesting element (hash %s)\n", 2505 "[OP %p] Requesting element (hash %s)\n",
2506 (void *) op, GNUNET_h2s (hash)); 2506 op, GNUNET_h2s (hash));
2507 ev = GNUNET_MQ_msg_header_extra (demands, 2507 ev = GNUNET_MQ_msg_header_extra (demands,
2508 sizeof(struct GNUNET_HashCode), 2508 sizeof(struct GNUNET_HashCode),
2509 GNUNET_MESSAGE_TYPE_SETU_P2P_DEMAND); 2509 GNUNET_MESSAGE_TYPE_SETU_P2P_DEMAND);