diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-10-16 10:20:32 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-10-16 10:20:32 +0200 |
commit | 09c3455b2c3dd01e52ac2dd9c62c41b3ebcf8028 (patch) | |
tree | 8a877f4c4c87a4fafc78b31735392b423360b5b8 /src | |
parent | 37b7ecf6fd4ac226dad911ef22a67a96d5ce514d (diff) | |
download | gnunet-09c3455b2c3dd01e52ac2dd9c62c41b3ebcf8028.tar.gz gnunet-09c3455b2c3dd01e52ac2dd9c62c41b3ebcf8028.zip |
-fix more warnings
Diffstat (limited to 'src')
-rw-r--r-- | src/ats-tests/ats-testing-log.c | 4 | ||||
-rw-r--r-- | src/datastore/datastore_api.c | 8 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_clients.c | 6 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_datacache.c | 4 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_neighbours.c | 4 | ||||
-rw-r--r-- | src/dht/plugin_block_dht.c | 2 | ||||
-rw-r--r-- | src/my/my_query_helper.c | 8 | ||||
-rw-r--r-- | src/nse/gnunet-nse-profiler.c | 2 | ||||
-rw-r--r-- | src/testbed-logger/gnunet-service-testbed-logger.c | 2 | ||||
-rw-r--r-- | src/testbed/gnunet-service-testbed_cpustatus.c | 2 | ||||
-rw-r--r-- | src/testbed/testbed_api.c | 2 | ||||
-rw-r--r-- | src/testbed/testbed_api_topology.c | 6 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_client.c | 15 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_common.c | 2 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 24 | ||||
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 12 | ||||
-rw-r--r-- | src/transport/plugin_transport_udp.c | 15 | ||||
-rw-r--r-- | src/transport/plugin_transport_unix.c | 4 | ||||
-rw-r--r-- | src/transport/tcp_connection_legacy.c | 16 | ||||
-rw-r--r-- | src/transport/tcp_service_legacy.c | 2 |
20 files changed, 70 insertions, 70 deletions
diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c index 38094a438..955401dd8 100644 --- a/src/ats-tests/ats-testing-log.c +++ b/src/ats-tests/ats-testing-log.c | |||
@@ -575,7 +575,7 @@ GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l, | |||
575 | 575 | ||
576 | /* Assembling slave string */ | 576 | /* Assembling slave string */ |
577 | GNUNET_asprintf (&data, | 577 | GNUNET_asprintf (&data, |
578 | "%llu;%llu;%u;%u;%u;%u;%u;%u;%.3f;%u;%u;%u;%u;%u;%u;%u;%.3f;%.3f\n", | 578 | "%llu;%llu;%u;%u;%u;%u;%u;%u;%.3f;%u;%u;%llu;%u;%u;%u;%u;%.3f;%.3f\n", |
579 | (long long unsigned | 579 | (long long unsigned |
580 | int) cur_lt->timestamp.abs_value_us, | 580 | int) cur_lt->timestamp.abs_value_us, |
581 | (long long unsigned | 581 | (long long unsigned |
@@ -593,7 +593,7 @@ GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l, | |||
593 | (double) plt->app_rtt / 1000, | 593 | (double) plt->app_rtt / 1000, |
594 | plt->bandwidth_in, | 594 | plt->bandwidth_in, |
595 | plt->bandwidth_out, | 595 | plt->bandwidth_out, |
596 | plt->ats_delay, | 596 | plt->ats_delay.rel_value_us, |
597 | plt->ats_distance, | 597 | plt->ats_distance, |
598 | plt->ats_network_type, | 598 | plt->ats_network_type, |
599 | plt->ats_utilization_out, | 599 | plt->ats_utilization_out, |
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c index 4537f6efe..bd7a612ed 100644 --- a/src/datastore/datastore_api.c +++ b/src/datastore/datastore_api.c | |||
@@ -994,8 +994,8 @@ GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, | |||
994 | } | 994 | } |
995 | 995 | ||
996 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 996 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
997 | "Asked to put %u bytes of data under key `%s' for %s\n", | 997 | "Asked to put %lu bytes of data under key `%s' for %s\n", |
998 | size, | 998 | (unsigned long) size, |
999 | GNUNET_h2s (key), | 999 | GNUNET_h2s (key), |
1000 | GNUNET_STRINGS_relative_time_to_string ( | 1000 | GNUNET_STRINGS_relative_time_to_string ( |
1001 | GNUNET_TIME_absolute_get_remaining (expiration), | 1001 | GNUNET_TIME_absolute_get_remaining (expiration), |
@@ -1205,8 +1205,8 @@ GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h, | |||
1205 | if (NULL == cont) | 1205 | if (NULL == cont) |
1206 | cont = &drop_status_cont; | 1206 | cont = &drop_status_cont; |
1207 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1207 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1208 | "Asked to remove %u bytes under key `%s'\n", | 1208 | "Asked to remove %lu bytes under key `%s'\n", |
1209 | size, | 1209 | (unsigned long) size, |
1210 | GNUNET_h2s (key)); | 1210 | GNUNET_h2s (key)); |
1211 | env = GNUNET_MQ_msg_extra (dm, | 1211 | env = GNUNET_MQ_msg_extra (dm, |
1212 | size, | 1212 | size, |
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c index 1e44c1fad..5eb3115f4 100644 --- a/src/dht/gnunet-service-dht_clients.c +++ b/src/dht/gnunet-service-dht_clients.c | |||
@@ -488,8 +488,8 @@ handle_dht_local_put (void *cls, | |||
488 | GNUNET_h2s_full (&dht_msg->key)); | 488 | GNUNET_h2s_full (&dht_msg->key)); |
489 | /* give to local clients */ | 489 | /* give to local clients */ |
490 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 490 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
491 | "Handling local PUT of %u-bytes for query %s\n", | 491 | "Handling local PUT of %lu-bytes for query %s\n", |
492 | size - sizeof(struct GNUNET_DHT_ClientPutMessage), | 492 | (unsigned long) (size - sizeof(struct GNUNET_DHT_ClientPutMessage)), |
493 | GNUNET_h2s (&dht_msg->key)); | 493 | GNUNET_h2s (&dht_msg->key)); |
494 | GDS_CLIENTS_handle_reply (GNUNET_TIME_absolute_ntoh (dht_msg->expiration), | 494 | GDS_CLIENTS_handle_reply (GNUNET_TIME_absolute_ntoh (dht_msg->expiration), |
495 | &dht_msg->key, | 495 | &dht_msg->key, |
@@ -619,7 +619,7 @@ handle_dht_local_get (void *cls, | |||
619 | "Received GET request for %s from local client %p, xq: %.*s\n", | 619 | "Received GET request for %s from local client %p, xq: %.*s\n", |
620 | GNUNET_h2s (&get->key), | 620 | GNUNET_h2s (&get->key), |
621 | ch->client, | 621 | ch->client, |
622 | xquery_size, | 622 | (int) xquery_size, |
623 | xquery); | 623 | xquery); |
624 | LOG_TRAFFIC (GNUNET_ERROR_TYPE_DEBUG, | 624 | LOG_TRAFFIC (GNUNET_ERROR_TYPE_DEBUG, |
625 | "CLIENT-GET %s\n", | 625 | "CLIENT-GET %s\n", |
diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c index 41b7a3a2b..7eded2152 100644 --- a/src/dht/gnunet-service-dht_datacache.c +++ b/src/dht/gnunet-service-dht_datacache.c | |||
@@ -94,9 +94,9 @@ GDS_DATACACHE_handle_put (struct GNUNET_TIME_Absolute expiration, | |||
94 | put_path_length, | 94 | put_path_length, |
95 | put_path); | 95 | put_path); |
96 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 96 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
97 | "DATACACHE PUT for key %s [%u] completed (%d) after %u hops\n", | 97 | "DATACACHE PUT for key %s [%lu] completed (%d) after %u hops\n", |
98 | GNUNET_h2s (key), | 98 | GNUNET_h2s (key), |
99 | data_size, | 99 | (unsigned long) data_size, |
100 | r, | 100 | r, |
101 | put_path_length); | 101 | put_path_length); |
102 | } | 102 | } |
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index b211fca6b..88b0c5d92 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c | |||
@@ -2212,8 +2212,8 @@ handle_dht_p2p_get (void *cls, | |||
2212 | bg, | 2212 | bg, |
2213 | peer_bf); | 2213 | peer_bf); |
2214 | GDS_CLIENTS_process_get (options | 2214 | GDS_CLIENTS_process_get (options |
2215 | | (GNUNET_OK == forwarded) | 2215 | | ((GNUNET_OK == forwarded) |
2216 | ? GNUNET_DHT_RO_LAST_HOP : 0, | 2216 | ? GNUNET_DHT_RO_LAST_HOP : 0), |
2217 | type, | 2217 | type, |
2218 | ntohl (get->hop_count), | 2218 | ntohl (get->hop_count), |
2219 | ntohl (get->desired_replication_level), | 2219 | ntohl (get->desired_replication_level), |
diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c index f213433ed..a9f336240 100644 --- a/src/dht/plugin_block_dht.c +++ b/src/dht/plugin_block_dht.c | |||
@@ -195,7 +195,7 @@ block_plugin_dht_get_key (void *cls, | |||
195 | { | 195 | { |
196 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, | 196 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, |
197 | "block-dht", | 197 | "block-dht", |
198 | _ ("Size mismatch for block\n"), | 198 | _ ("Size mismatch for block with type %u\n"), |
199 | GNUNET_BLOCK_TYPE_DHT_HELLO); | 199 | GNUNET_BLOCK_TYPE_DHT_HELLO); |
200 | return GNUNET_NO; | 200 | return GNUNET_NO; |
201 | } | 201 | } |
diff --git a/src/my/my_query_helper.c b/src/my/my_query_helper.c index 526e57b8b..97ea04fd1 100644 --- a/src/my/my_query_helper.c +++ b/src/my/my_query_helper.c | |||
@@ -280,14 +280,14 @@ my_conv_rsa_public_key (void *cls, | |||
280 | MYSQL_BIND *qbind) | 280 | MYSQL_BIND *qbind) |
281 | { | 281 | { |
282 | const struct GNUNET_CRYPTO_RsaPublicKey *rsa = qp->data; | 282 | const struct GNUNET_CRYPTO_RsaPublicKey *rsa = qp->data; |
283 | char *buf; | 283 | void *buf; |
284 | size_t buf_size; | 284 | size_t buf_size; |
285 | 285 | ||
286 | (void) cls; | 286 | (void) cls; |
287 | GNUNET_assert (1 == qp->num_params); | 287 | GNUNET_assert (1 == qp->num_params); |
288 | buf_size = GNUNET_CRYPTO_rsa_public_key_encode (rsa, | 288 | buf_size = GNUNET_CRYPTO_rsa_public_key_encode (rsa, |
289 | &buf); | 289 | &buf); |
290 | qbind->buffer = (void *) buf; | 290 | qbind->buffer = buf; |
291 | qbind->buffer_length = buf_size; | 291 | qbind->buffer_length = buf_size; |
292 | qbind->buffer_type = MYSQL_TYPE_BLOB; | 292 | qbind->buffer_type = MYSQL_TYPE_BLOB; |
293 | return 1; | 293 | return 1; |
@@ -332,14 +332,14 @@ my_conv_rsa_signature (void *cls, | |||
332 | MYSQL_BIND *qbind) | 332 | MYSQL_BIND *qbind) |
333 | { | 333 | { |
334 | const struct GNUNET_CRYPTO_RsaSignature *sig = qp->data; | 334 | const struct GNUNET_CRYPTO_RsaSignature *sig = qp->data; |
335 | char *buf; | 335 | void *buf; |
336 | size_t buf_size; | 336 | size_t buf_size; |
337 | 337 | ||
338 | (void) cls; | 338 | (void) cls; |
339 | GNUNET_assert (1 == qp->num_params); | 339 | GNUNET_assert (1 == qp->num_params); |
340 | buf_size = GNUNET_CRYPTO_rsa_signature_encode (sig, | 340 | buf_size = GNUNET_CRYPTO_rsa_signature_encode (sig, |
341 | &buf); | 341 | &buf); |
342 | qbind->buffer = (void *) buf; | 342 | qbind->buffer = buf; |
343 | qbind->buffer_length = buf_size; | 343 | qbind->buffer_length = buf_size; |
344 | qbind->buffer_type = MYSQL_TYPE_BLOB; | 344 | qbind->buffer_type = MYSQL_TYPE_BLOB; |
345 | return 1; | 345 | return 1; |
diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c index 81a16b245..f653a716e 100644 --- a/src/nse/gnunet-nse-profiler.c +++ b/src/nse/gnunet-nse-profiler.c | |||
@@ -317,7 +317,7 @@ handle_estimate (void *cls, | |||
317 | } | 317 | } |
318 | size = GNUNET_snprintf (output_buffer, | 318 | size = GNUNET_snprintf (output_buffer, |
319 | sizeof(output_buffer), | 319 | sizeof(output_buffer), |
320 | "%p %llu %llu %f %f %f\n", | 320 | "%p %u %llu %f %f %f\n", |
321 | peer, | 321 | peer, |
322 | peers_running, | 322 | peers_running, |
323 | (unsigned long long) timestamp.abs_value_us, | 323 | (unsigned long long) timestamp.abs_value_us, |
diff --git a/src/testbed-logger/gnunet-service-testbed-logger.c b/src/testbed-logger/gnunet-service-testbed-logger.c index 81652fa4f..bc2f0abe0 100644 --- a/src/testbed-logger/gnunet-service-testbed-logger.c +++ b/src/testbed-logger/gnunet-service-testbed-logger.c | |||
@@ -198,7 +198,7 @@ logger_run (void *cls, | |||
198 | GNUNET_asprintf (&fn, | 198 | GNUNET_asprintf (&fn, |
199 | "%s/%.*s_%jd.dat", | 199 | "%s/%.*s_%jd.dat", |
200 | dir, | 200 | dir, |
201 | hname_len, | 201 | (int) hname_len, |
202 | hname, | 202 | hname, |
203 | (intmax_t) pid); | 203 | (intmax_t) pid); |
204 | GNUNET_free (hname); | 204 | GNUNET_free (hname); |
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c index 70b865c73..440f2c24f 100644 --- a/src/testbed/gnunet-service-testbed_cpustatus.c +++ b/src/testbed/gnunet-service-testbed_cpustatus.c | |||
@@ -608,7 +608,7 @@ GST_stats_init (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
608 | return; | 608 | return; |
609 | } | 609 | } |
610 | fn = NULL; | 610 | fn = NULL; |
611 | (void) GNUNET_asprintf (&fn, "%s/%.*s-%jd.dat", stats_dir, len, | 611 | (void) GNUNET_asprintf (&fn, "%s/%.*s-%jd.dat", stats_dir, (int)len, |
612 | hostname, (intmax_t) getpid ()); | 612 | hostname, (intmax_t) getpid ()); |
613 | GNUNET_free (stats_dir); | 613 | GNUNET_free (stats_dir); |
614 | GNUNET_free (hostname); | 614 | GNUNET_free (hostname); |
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 697783d96..09752ba28 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -448,7 +448,7 @@ handle_opsuccess ( | |||
448 | uint64_t op_id; | 448 | uint64_t op_id; |
449 | 449 | ||
450 | op_id = GNUNET_ntohll (msg->operation_id); | 450 | op_id = GNUNET_ntohll (msg->operation_id); |
451 | LOG_DEBUG ("Operation %lu successful\n", op_id); | 451 | LOG_DEBUG ("Operation %llu successful\n", op_id); |
452 | if (NULL == (opc = find_opc (c, op_id))) | 452 | if (NULL == (opc = find_opc (c, op_id))) |
453 | { | 453 | { |
454 | LOG_DEBUG ("Operation not found\n"); | 454 | LOG_DEBUG ("Operation not found\n"); |
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c index 1d765af92..a9a340e99 100644 --- a/src/testbed/testbed_api_topology.c +++ b/src/testbed/testbed_api_topology.c | |||
@@ -1089,7 +1089,7 @@ gen_topo_from_file (struct TopologyContext *tc, | |||
1089 | if (tc->num_peers <= peer_id) | 1089 | if (tc->num_peers <= peer_id) |
1090 | { | 1090 | { |
1091 | LOG (GNUNET_ERROR_TYPE_ERROR, | 1091 | LOG (GNUNET_ERROR_TYPE_ERROR, |
1092 | _ ("Topology file needs more peers than given ones\n"), filename); | 1092 | _ ("Topology file needs more peers than given ones\n")); |
1093 | goto _exit; | 1093 | goto _exit; |
1094 | } | 1094 | } |
1095 | state = OTHER_PEER_INDEX; | 1095 | state = OTHER_PEER_INDEX; |
@@ -1114,7 +1114,7 @@ gen_topo_from_file (struct TopologyContext *tc, | |||
1114 | if (tc->num_peers <= other_peer_id) | 1114 | if (tc->num_peers <= other_peer_id) |
1115 | { | 1115 | { |
1116 | LOG (GNUNET_ERROR_TYPE_ERROR, | 1116 | LOG (GNUNET_ERROR_TYPE_ERROR, |
1117 | _ ("Topology file needs more peers than given ones\n"), filename); | 1117 | _ ("Topology file needs more peers than given ones\n")); |
1118 | goto _exit; | 1118 | goto _exit; |
1119 | } | 1119 | } |
1120 | if (peer_id != other_peer_id) | 1120 | if (peer_id != other_peer_id) |
@@ -1150,7 +1150,7 @@ gen_topo_from_file (struct TopologyContext *tc, | |||
1150 | } | 1150 | } |
1151 | else | 1151 | else |
1152 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1152 | LOG (GNUNET_ERROR_TYPE_WARNING, |
1153 | _ ("Ignoring to connect peer %u to peer %u\n"), | 1153 | _ ("Ignoring to connect peer %lu to peer %lu\n"), |
1154 | peer_id, | 1154 | peer_id, |
1155 | other_peer_id); | 1155 | other_peer_id); |
1156 | while (('\n' != data[offset]) && ('|' != data[offset]) && (offset < fs)) | 1156 | while (('\n' != data[offset]) && ('|' != data[offset]) && (offset < fs)) |
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index 92ed2fe52..219fae57b 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c | |||
@@ -769,10 +769,10 @@ http_client_plugin_send (void *cls, | |||
769 | char *stat_txt; | 769 | char *stat_txt; |
770 | 770 | ||
771 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 771 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
772 | "Session %p/request %p: Sending message with %u to peer `%s' \n", | 772 | "Session %p/request %p: Sending message with %lu to peer `%s' \n", |
773 | s, | 773 | s, |
774 | s->put.easyhandle, | 774 | s->put.easyhandle, |
775 | msgbuf_size, | 775 | (unsigned long) msgbuf_size, |
776 | GNUNET_i2s (&s->address->peer)); | 776 | GNUNET_i2s (&s->address->peer)); |
777 | 777 | ||
778 | /* create new message and schedule */ | 778 | /* create new message and schedule */ |
@@ -1087,11 +1087,10 @@ client_send_cb (void *stream, | |||
1087 | if (msg->pos == msg->size) | 1087 | if (msg->pos == msg->size) |
1088 | { | 1088 | { |
1089 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1089 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1090 | "Session %p/request %p: sent message with %u bytes sent, removing message from queue\n", | 1090 | "Session %p/request %p: sent message with %lu bytes sent, removing message from queue\n", |
1091 | s, | 1091 | s, |
1092 | s->put.easyhandle, | 1092 | s->put.easyhandle, |
1093 | msg->size, | 1093 | (unsigned long) msg->size); |
1094 | msg->pos); | ||
1095 | /* Calling transmit continuation */ | 1094 | /* Calling transmit continuation */ |
1096 | GNUNET_CONTAINER_DLL_remove (s->msg_head, | 1095 | GNUNET_CONTAINER_DLL_remove (s->msg_head, |
1097 | s->msg_tail, | 1096 | s->msg_tail, |
@@ -1249,10 +1248,10 @@ client_receive (void *stream, | |||
1249 | size_t len = size * nmemb; | 1248 | size_t len = size * nmemb; |
1250 | 1249 | ||
1251 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1250 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1252 | "Session %p / request %p: Received %u bytes from peer `%s'\n", | 1251 | "Session %p / request %p: Received %lu bytes from peer `%s'\n", |
1253 | s, | 1252 | s, |
1254 | s->get.easyhandle, | 1253 | s->get.easyhandle, |
1255 | len, | 1254 | (unsigned long) len, |
1256 | GNUNET_i2s (&s->address->peer)); | 1255 | GNUNET_i2s (&s->address->peer)); |
1257 | now = GNUNET_TIME_absolute_get (); | 1256 | now = GNUNET_TIME_absolute_get (); |
1258 | if (now.abs_value_us < s->next_receive.abs_value_us) | 1257 | if (now.abs_value_us < s->next_receive.abs_value_us) |
@@ -1346,7 +1345,7 @@ client_run (void *cls) | |||
1346 | /* Log status of terminated request */ | 1345 | /* Log status of terminated request */ |
1347 | if ((0 != msg->data.result) || (http_statuscode != 200)) | 1346 | if ((0 != msg->data.result) || (http_statuscode != 200)) |
1348 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1347 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1349 | "Session %p/request %p: %s request to `%s' ended with status %i reason %i: `%s'\n", | 1348 | "Session %p/request %p: %s request to `%s' ended with status %li reason %i: `%s'\n", |
1350 | s, msg->easy_handle, | 1349 | s, msg->easy_handle, |
1351 | (GNUNET_YES == put_request) ? "PUT" : "GET", | 1350 | (GNUNET_YES == put_request) ? "PUT" : "GET", |
1352 | GNUNET_i2s (&s->address->peer), | 1351 | GNUNET_i2s (&s->address->peer), |
diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c index d81d6db9c..0e3778837 100644 --- a/src/transport/plugin_transport_http_common.c +++ b/src/transport/plugin_transport_http_common.c | |||
@@ -629,7 +629,7 @@ http_common_plugin_address_to_string (const char *plugin, | |||
629 | if (addr_str[ntohl (address->urlen) - 1] != '\0') | 629 | if (addr_str[ntohl (address->urlen) - 1] != '\0') |
630 | return NULL; | 630 | return NULL; |
631 | GNUNET_asprintf (&res, "%s.%u.%s", plugin, ntohl (address->options), | 631 | GNUNET_asprintf (&res, "%s.%u.%s", plugin, ntohl (address->options), |
632 | &address[1]); | 632 | (char*)&address[1]); |
633 | if (strlen (res) + 1 < 500) | 633 | if (strlen (res) + 1 < 500) |
634 | { | 634 | { |
635 | GNUNET_memcpy (rbuf, res, strlen (res) + 1); | 635 | GNUNET_memcpy (rbuf, res, strlen (res) + 1); |
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index d1b21ba9c..6e95ca00c 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c | |||
@@ -745,10 +745,10 @@ http_server_plugin_send (void *cls, | |||
745 | char *stat_txt; | 745 | char *stat_txt; |
746 | 746 | ||
747 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 747 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
748 | "Session %p/request %p: Sending message with %u to peer `%s'\n", | 748 | "Session %p/request %p: Sending message with %lu to peer `%s'\n", |
749 | session, | 749 | session, |
750 | session->server_send, | 750 | session->server_send, |
751 | msgbuf_size, | 751 | (unsigned long) msgbuf_size, |
752 | GNUNET_i2s (&session->target)); | 752 | GNUNET_i2s (&session->target)); |
753 | 753 | ||
754 | /* create new message and schedule */ | 754 | /* create new message and schedule */ |
@@ -1270,8 +1270,8 @@ server_parse_url (struct HTTP_Server_Plugin *plugin, | |||
1270 | if (hash_length != plugin->peer_id_length) | 1270 | if (hash_length != plugin->peer_id_length) |
1271 | { | 1271 | { |
1272 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1272 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1273 | "URL target is %u bytes, expecting %u\n", | 1273 | "URL target is %lu bytes, expecting %u\n", |
1274 | hash_length, plugin->peer_id_length); | 1274 | (unsigned long) hash_length, plugin->peer_id_length); |
1275 | return GNUNET_SYSERR; | 1275 | return GNUNET_SYSERR; |
1276 | } | 1276 | } |
1277 | if (GNUNET_OK != | 1277 | if (GNUNET_OK != |
@@ -1616,8 +1616,8 @@ server_send_callback (void *cls, | |||
1616 | { | 1616 | { |
1617 | sc->connected = GNUNET_YES; | 1617 | sc->connected = GNUNET_YES; |
1618 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1618 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1619 | "Sent %u bytes to peer `%s' with session %p \n", | 1619 | "Sent %lu bytes to peer `%s' with session %p \n", |
1620 | bytes_read, | 1620 | (unsigned long) bytes_read, |
1621 | GNUNET_i2s (&s->target), | 1621 | GNUNET_i2s (&s->target), |
1622 | s); | 1622 | s); |
1623 | GNUNET_asprintf (&stat_txt, | 1623 | GNUNET_asprintf (&stat_txt, |
@@ -1761,14 +1761,14 @@ server_access_cb (void *cls, | |||
1761 | 1761 | ||
1762 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1762 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1763 | _ ( | 1763 | _ ( |
1764 | "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data size %u\n"), | 1764 | "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data size %lu\n"), |
1765 | sc, | 1765 | sc, |
1766 | plugin->cur_request, | 1766 | plugin->cur_request, |
1767 | plugin->max_request, | 1767 | plugin->max_request, |
1768 | method, | 1768 | method, |
1769 | version, | 1769 | version, |
1770 | url, | 1770 | url, |
1771 | (*upload_data_size)); | 1771 | (unsigned long) (*upload_data_size)); |
1772 | if (NULL == sc) | 1772 | if (NULL == sc) |
1773 | { | 1773 | { |
1774 | /* CORS pre-flight request */ | 1774 | /* CORS pre-flight request */ |
@@ -1868,19 +1868,19 @@ server_access_cb (void *cls, | |||
1868 | 1868 | ||
1869 | /* (*upload_data_size > 0) for every segment received */ | 1869 | /* (*upload_data_size > 0) for every segment received */ |
1870 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1870 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1871 | "Session %p / Connection %p: Peer `%s' PUT on address `%s' received %u bytes\n", | 1871 | "Session %p / Connection %p: Peer `%s' PUT on address `%s' received %lu bytes\n", |
1872 | s, sc, | 1872 | s, sc, |
1873 | GNUNET_i2s (&s->target), | 1873 | GNUNET_i2s (&s->target), |
1874 | http_common_plugin_address_to_string (plugin->protocol, | 1874 | http_common_plugin_address_to_string (plugin->protocol, |
1875 | s->address->address, | 1875 | s->address->address, |
1876 | s->address->address_length), | 1876 | s->address->address_length), |
1877 | *upload_data_size); | 1877 | (unsigned long) *upload_data_size); |
1878 | delay = GNUNET_TIME_absolute_get_remaining (s->next_receive); | 1878 | delay = GNUNET_TIME_absolute_get_remaining (s->next_receive); |
1879 | if (0 == delay.rel_value_us) | 1879 | if (0 == delay.rel_value_us) |
1880 | { | 1880 | { |
1881 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1881 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1882 | "PUT with %u bytes forwarded to MST\n", | 1882 | "PUT with %lu bytes forwarded to MST\n", |
1883 | *upload_data_size); | 1883 | (unsigned long) *upload_data_size); |
1884 | if (s->msg_tk == NULL) | 1884 | if (s->msg_tk == NULL) |
1885 | { | 1885 | { |
1886 | s->msg_tk = GNUNET_MST_create (&server_receive_mst_cb, | 1886 | s->msg_tk = GNUNET_MST_create (&server_receive_mst_cb, |
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index e3bc21543..8378a64dd 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -2010,8 +2010,8 @@ do_transmit (void *cls, size_t size, void *buf) | |||
2010 | GNUNET_assert (pos->message_size <= session->bytes_in_queue); | 2010 | GNUNET_assert (pos->message_size <= session->bytes_in_queue); |
2011 | session->bytes_in_queue -= pos->message_size; | 2011 | session->bytes_in_queue -= pos->message_size; |
2012 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2012 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2013 | "Failed to transmit %u byte message to `%s'.\n", | 2013 | "Failed to transmit %lu byte message to `%s'.\n", |
2014 | pos->message_size, | 2014 | (unsigned long) pos->message_size, |
2015 | GNUNET_i2s (&session->target)); | 2015 | GNUNET_i2s (&session->target)); |
2016 | ret += pos->message_size; | 2016 | ret += pos->message_size; |
2017 | GNUNET_CONTAINER_DLL_insert_after (hd, tl, tl, pos); | 2017 | GNUNET_CONTAINER_DLL_insert_after (hd, tl, tl, pos); |
@@ -2067,9 +2067,9 @@ do_transmit (void *cls, size_t size, void *buf) | |||
2067 | session->bytes_in_queue -= pos->message_size; | 2067 | session->bytes_in_queue -= pos->message_size; |
2068 | GNUNET_assert (size >= pos->message_size); | 2068 | GNUNET_assert (size >= pos->message_size); |
2069 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2069 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2070 | "Transmitting message of type %u size %u to peer %s at %s\n", | 2070 | "Transmitting message of type %u size %lu to peer %s at %s\n", |
2071 | ntohs (((struct GNUNET_MessageHeader *) pos->msg)->type), | 2071 | ntohs (((struct GNUNET_MessageHeader *) pos->msg)->type), |
2072 | pos->message_size, | 2072 | (unsigned long) pos->message_size, |
2073 | GNUNET_i2s (&session->target), | 2073 | GNUNET_i2s (&session->target), |
2074 | tcp_plugin_address_to_string (session->plugin, | 2074 | tcp_plugin_address_to_string (session->plugin, |
2075 | session->address->address, | 2075 | session->address->address, |
@@ -2192,8 +2192,8 @@ tcp_plugin_send (void *cls, | |||
2192 | pm->transmit_cont_cls = cont_cls; | 2192 | pm->transmit_cont_cls = cont_cls; |
2193 | 2193 | ||
2194 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2194 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2195 | "Asked to transmit %u bytes to `%s', added message to list.\n", | 2195 | "Asked to transmit %lu bytes to `%s', added message to list.\n", |
2196 | msgbuf_size, | 2196 | (unsigned long) msgbuf_size, |
2197 | GNUNET_i2s (&session->target)); | 2197 | GNUNET_i2s (&session->target)); |
2198 | 2198 | ||
2199 | if (GNUNET_YES == | 2199 | if (GNUNET_YES == |
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index ec3a0edd8..49e84dfe7 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c | |||
@@ -1821,7 +1821,8 @@ enqueue_fragment (void *cls, const struct GNUNET_MessageHeader *msg) | |||
1821 | struct GNUNET_ATS_Session *session = frag_ctx->session; | 1821 | struct GNUNET_ATS_Session *session = frag_ctx->session; |
1822 | size_t msg_len = ntohs (msg->size); | 1822 | size_t msg_len = ntohs (msg->size); |
1823 | 1823 | ||
1824 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Enqueuing fragment with %u bytes\n", msg_len); | 1824 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Enqueuing fragment with %lu bytes\n", |
1825 | (unsigned long) msg_len); | ||
1825 | udpw = GNUNET_malloc (sizeof(struct UDP_MessageWrapper) + msg_len); | 1826 | udpw = GNUNET_malloc (sizeof(struct UDP_MessageWrapper) + msg_len); |
1826 | udpw->session = session; | 1827 | udpw->session = session; |
1827 | udpw->msg_buf = (char *) &udpw[1]; | 1828 | udpw->msg_buf = (char *) &udpw[1]; |
@@ -1996,8 +1997,8 @@ udp_plugin_send (void *cls, | |||
1996 | return GNUNET_SYSERR; | 1997 | return GNUNET_SYSERR; |
1997 | } | 1998 | } |
1998 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1999 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1999 | "UDP transmits %u-byte message to `%s' using address `%s'\n", | 2000 | "UDP transmits %lu-byte message to `%s' using address `%s'\n", |
2000 | udpmlen, | 2001 | (unsigned long) udpmlen, |
2001 | GNUNET_i2s (&s->target), | 2002 | GNUNET_i2s (&s->target), |
2002 | udp_address_to_string (plugin, | 2003 | udp_address_to_string (plugin, |
2003 | s->address->address, | 2004 | s->address->address, |
@@ -3113,18 +3114,18 @@ remove_timeout_messages_and_select (struct Plugin *plugin, | |||
3113 | { | 3114 | { |
3114 | /* this message is not delayed */ | 3115 | /* this message is not delayed */ |
3115 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 3116 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
3116 | "Message for peer `%s' (%u bytes) is not delayed \n", | 3117 | "Message for peer `%s' (%lu bytes) is not delayed \n", |
3117 | GNUNET_i2s (&udpw->session->target), | 3118 | GNUNET_i2s (&udpw->session->target), |
3118 | udpw->payload_size); | 3119 | (unsigned long) udpw->payload_size); |
3119 | break; /* Found message to send, break */ | 3120 | break; /* Found message to send, break */ |
3120 | } | 3121 | } |
3121 | else | 3122 | else |
3122 | { | 3123 | { |
3123 | /* Message is delayed, try next */ | 3124 | /* Message is delayed, try next */ |
3124 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 3125 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
3125 | "Message for peer `%s' (%u bytes) is delayed for %s\n", | 3126 | "Message for peer `%s' (%lu bytes) is delayed for %s\n", |
3126 | GNUNET_i2s (&udpw->session->target), | 3127 | GNUNET_i2s (&udpw->session->target), |
3127 | udpw->payload_size, | 3128 | (unsigned long) udpw->payload_size, |
3128 | GNUNET_STRINGS_relative_time_to_string (remaining, GNUNET_YES)); | 3129 | GNUNET_STRINGS_relative_time_to_string (remaining, GNUNET_YES)); |
3129 | udpw = udpw->next; | 3130 | udpw = udpw->next; |
3130 | } | 3131 | } |
diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c index 9d3e7d354..2324914c9 100644 --- a/src/transport/plugin_transport_unix.c +++ b/src/transport/plugin_transport_unix.c | |||
@@ -1304,8 +1304,8 @@ unix_plugin_send (void *cls, | |||
1304 | return GNUNET_SYSERR; | 1304 | return GNUNET_SYSERR; |
1305 | } | 1305 | } |
1306 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1306 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1307 | "Sending %u bytes with session for peer `%s' `%s'\n", | 1307 | "Sending %lu bytes with session for peer `%s' `%s'\n", |
1308 | msgbuf_size, | 1308 | (unsigned long) msgbuf_size, |
1309 | GNUNET_i2s (&session->target), | 1309 | GNUNET_i2s (&session->target), |
1310 | unix_plugin_address_to_string (NULL, | 1310 | unix_plugin_address_to_string (NULL, |
1311 | session->address->address, | 1311 | session->address->address, |
diff --git a/src/transport/tcp_connection_legacy.c b/src/transport/tcp_connection_legacy.c index 3e173b8a4..924362ef2 100644 --- a/src/transport/tcp_connection_legacy.c +++ b/src/transport/tcp_connection_legacy.c | |||
@@ -1142,9 +1142,9 @@ RETRY: | |||
1142 | return; | 1142 | return; |
1143 | } | 1143 | } |
1144 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1144 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1145 | "receive_ready read %u/%u bytes from `%s' (%p)!\n", | 1145 | "receive_ready read %lu/%lu bytes from `%s' (%p)!\n", |
1146 | (unsigned int) ret, | 1146 | (unsigned long) ret, |
1147 | connection->max, | 1147 | (unsigned long) connection->max, |
1148 | GNUNET_a2s (connection->addr, connection->addrlen), | 1148 | GNUNET_a2s (connection->addr, connection->addrlen), |
1149 | connection); | 1149 | connection); |
1150 | GNUNET_assert (NULL != (receiver = connection->receiver)); | 1150 | GNUNET_assert (NULL != (receiver = connection->receiver)); |
@@ -1327,8 +1327,8 @@ connect_error (void *cls) | |||
1327 | GNUNET_CONNECTION_TransmitReadyNotify notify; | 1327 | GNUNET_CONNECTION_TransmitReadyNotify notify; |
1328 | 1328 | ||
1329 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1329 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1330 | "Transmission request of size %u fails (%s/%u), connection failed (%p).\n", | 1330 | "Transmission request of size %lu fails (%s/%u), connection failed (%p).\n", |
1331 | connection->nth.notify_size, | 1331 | (unsigned long) connection->nth.notify_size, |
1332 | connection->hostname, | 1332 | connection->hostname, |
1333 | connection->port, | 1333 | connection->port, |
1334 | connection); | 1334 | connection); |
@@ -1423,9 +1423,9 @@ RETRY: | |||
1423 | return; | 1423 | return; |
1424 | } | 1424 | } |
1425 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1425 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1426 | "Connection transmitted %u/%u bytes to `%s' (%p)\n", | 1426 | "Connection transmitted %lu/%lu bytes to `%s' (%p)\n", |
1427 | (unsigned int) ret, | 1427 | (unsigned long) ret, |
1428 | have, | 1428 | (unsigned long) have, |
1429 | GNUNET_a2s (connection->addr, connection->addrlen), | 1429 | GNUNET_a2s (connection->addr, connection->addrlen), |
1430 | connection); | 1430 | connection); |
1431 | connection->write_buffer_pos += ret; | 1431 | connection->write_buffer_pos += ret; |
diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c index 12dce3993..8606b353b 100644 --- a/src/transport/tcp_service_legacy.c +++ b/src/transport/tcp_service_legacy.c | |||
@@ -1433,7 +1433,7 @@ LEGACY_SERVICE_run (int argc, | |||
1433 | { | 1433 | { |
1434 | clock_offset = skew_offset - skew_variance; | 1434 | clock_offset = skew_offset - skew_variance; |
1435 | GNUNET_TIME_set_offset (clock_offset); | 1435 | GNUNET_TIME_set_offset (clock_offset); |
1436 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Skewing clock by %dll ms\n", clock_offset); | 1436 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Skewing clock by %lld ms\n", clock_offset); |
1437 | } | 1437 | } |
1438 | /* actually run service */ | 1438 | /* actually run service */ |
1439 | err = 0; | 1439 | err = 0; |