diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-05-06 15:20:10 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-05-06 15:20:10 +0000 |
commit | 8e325aefdaab6aae4567762bd639dfa1db3c4f15 (patch) | |
tree | e18e0515ffab51e8871dbf371750b21382691bdc | |
parent | 221996eb735384bb5478819e4358d2c648a16d7b (diff) | |
download | gnunet-8e325aefdaab6aae4567762bd639dfa1db3c4f15.tar.gz gnunet-8e325aefdaab6aae4567762bd639dfa1db3c4f15.zip |
fix compiler warnings
-rw-r--r-- | src/cadet/test_cadet.c | 44 | ||||
-rw-r--r-- | src/cadet/test_cadet_local.c | 3 | ||||
-rw-r--r-- | src/core/test_core_quota_compliance.c | 11 | ||||
-rw-r--r-- | src/dht/test_dht_monitor.c | 3 | ||||
-rw-r--r-- | src/fs/test_fs_test_lib.c | 3 | ||||
-rw-r--r-- | src/fs/test_gnunet_service_fs_migration.c | 3 | ||||
-rw-r--r-- | src/fs/test_gnunet_service_fs_p2p.c | 3 | ||||
-rw-r--r-- | src/gnsrecord/test_gnsrecord_serialization.c | 18 | ||||
-rw-r--r-- | src/multicast/test_multicast.c | 13 | ||||
-rw-r--r-- | src/psycstore/test_psycstore.c | 10 | ||||
-rw-r--r-- | src/psycutil/psyc_message.c | 38 | ||||
-rw-r--r-- | src/statistics/test_statistics_api_watch_zero_value.c | 26 | ||||
-rw-r--r-- | src/transport/test_plugin_transport.c | 2 |
13 files changed, 118 insertions, 59 deletions
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c index b3ded1bdf..8c8d7223e 100644 --- a/src/cadet/test_cadet.c +++ b/src/cadet/test_cadet.c | |||
@@ -363,21 +363,28 @@ stats_cont (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg) | |||
363 | * @param subsystem name of subsystem that created the statistic | 363 | * @param subsystem name of subsystem that created the statistic |
364 | * @param name the name of the datum | 364 | * @param name the name of the datum |
365 | * @param value the current value | 365 | * @param value the current value |
366 | * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not | 366 | * @param is_persistent #GNUNET_YES if the value is persistent, #GNUNET_NO if not |
367 | * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration | 367 | * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration |
368 | */ | 368 | */ |
369 | static int | 369 | static int |
370 | stats_iterator (void *cls, const struct GNUNET_TESTBED_Peer *peer, | 370 | stats_iterator (void *cls, |
371 | const char *subsystem, const char *name, | 371 | const struct GNUNET_TESTBED_Peer *peer, |
372 | uint64_t value, int is_persistent) | 372 | const char *subsystem, |
373 | const char *name, | ||
374 | uint64_t value, | ||
375 | int is_persistent) | ||
373 | { | 376 | { |
374 | static const char *s_sent = "# keepalives sent"; | 377 | static const char *s_sent = "# keepalives sent"; |
375 | static const char *s_recv = "# keepalives received"; | 378 | static const char *s_recv = "# keepalives received"; |
376 | uint32_t i; | 379 | uint32_t i; |
377 | 380 | ||
378 | i = GNUNET_TESTBED_get_index (peer); | 381 | i = GNUNET_TESTBED_get_index (peer); |
379 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "STATS PEER %u - %s [%s]: %llu\n", | 382 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
380 | i, subsystem, name, value); | 383 | "STATS PEER %u - %s [%s]: %llu\n", |
384 | i, | ||
385 | subsystem, | ||
386 | name, | ||
387 | (unsigned long long) value); | ||
381 | if (0 == strncmp (s_sent, name, strlen (s_sent)) && 0 == i) | 388 | if (0 == strncmp (s_sent, name, strlen (s_sent)) && 0 == i) |
382 | ka_sent = value; | 389 | ka_sent = value; |
383 | 390 | ||
@@ -401,7 +408,7 @@ gather_stats_and_exit (void *cls) | |||
401 | disconnect_task = NULL; | 408 | disconnect_task = NULL; |
402 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 409 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
403 | "gathering statistics from line %d\n", | 410 | "gathering statistics from line %d\n", |
404 | l); | 411 | (int) l); |
405 | if (NULL != ch) | 412 | if (NULL != ch) |
406 | { | 413 | { |
407 | if (NULL != th) | 414 | if (NULL != th) |
@@ -497,7 +504,9 @@ data_task (void *cls) | |||
497 | else | 504 | else |
498 | { | 505 | { |
499 | i++; | 506 | i++; |
500 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "in %u ms\n", i); | 507 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
508 | "in %llu ms\n", | ||
509 | (unsigned long long) i); | ||
501 | data_job = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, | 510 | data_job = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, |
502 | i), | 511 | i), |
503 | &data_task, (void *) i); | 512 | &data_task, (void *) i); |
@@ -535,7 +544,10 @@ tmt_rdy (void *cls, size_t size, void *buf) | |||
535 | { | 544 | { |
536 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 545 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
537 | "size %u, buf %p, data_sent %u, ack_received %u\n", | 546 | "size %u, buf %p, data_sent %u, ack_received %u\n", |
538 | size, buf, data_sent, ack_received); | 547 | (unsigned int) size, |
548 | buf, | ||
549 | data_sent, | ||
550 | ack_received); | ||
539 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ok %u, ok goal %u\n", ok, ok_goal); | 551 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ok %u, ok goal %u\n", ok, ok_goal); |
540 | GNUNET_break (ok >= ok_goal - 2); | 552 | GNUNET_break (ok >= ok_goal - 2); |
541 | 553 | ||
@@ -559,8 +571,10 @@ tmt_rdy (void *cls, size_t size, void *buf) | |||
559 | else | 571 | else |
560 | data_sent++; | 572 | data_sent++; |
561 | counter++; | 573 | counter++; |
562 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, " Sent message %d size %u\n", | 574 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
563 | counter, msg_size); | 575 | " Sent message %u size %u\n", |
576 | counter, | ||
577 | (unsigned int) msg_size); | ||
564 | if (data_sent < TOTAL_PACKETS && SPEED == test) | 578 | if (data_sent < TOTAL_PACKETS && SPEED == test) |
565 | { | 579 | { |
566 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Scheduling message %d\n", | 580 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Scheduling message %d\n", |
@@ -751,7 +765,8 @@ incoming_channel (void *cls, struct GNUNET_CADET_Channel *channel, | |||
751 | { | 765 | { |
752 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 766 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
753 | "Incoming channel from %s to peer %d\n", | 767 | "Incoming channel from %s to peer %d\n", |
754 | GNUNET_i2s (initiator), (long) cls); | 768 | GNUNET_i2s (initiator), |
769 | (int) (long) cls); | ||
755 | ok++; | 770 | ok++; |
756 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok); | 771 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok); |
757 | if ((long) cls == peers_requested - 1) | 772 | if ((long) cls == peers_requested - 1) |
@@ -807,7 +822,8 @@ channel_cleaner (void *cls, const struct GNUNET_CADET_Channel *channel, | |||
807 | } | 822 | } |
808 | else | 823 | else |
809 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 824 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
810 | "Unknown peer! %d\n", i); | 825 | "Unknown peer! %d\n", |
826 | (int) i); | ||
811 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok); | 827 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok); |
812 | 828 | ||
813 | if (NULL != disconnect_task) | 829 | if (NULL != disconnect_task) |
diff --git a/src/cadet/test_cadet_local.c b/src/cadet/test_cadet_local.c index a17d8f1ab..d52e06282 100644 --- a/src/cadet/test_cadet_local.c +++ b/src/cadet/test_cadet_local.c | |||
@@ -156,7 +156,8 @@ inbound_channel (void *cls, | |||
156 | 156 | ||
157 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 157 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
158 | "received incoming channel on peer %d, port %u\n", | 158 | "received incoming channel on peer %d, port %u\n", |
159 | id, port); | 159 | (int) id, |
160 | (unsigned int) port); | ||
160 | if (id != 2L) | 161 | if (id != 2L) |
161 | { | 162 | { |
162 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 163 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index e28f57fa6..59a3e8a7f 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -415,19 +415,22 @@ disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) | |||
415 | 415 | ||
416 | 416 | ||
417 | static int | 417 | static int |
418 | inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, | 418 | inbound_notify (void *cls, |
419 | const struct GNUNET_PeerIdentity *other, | ||
419 | const struct GNUNET_MessageHeader *message) | 420 | const struct GNUNET_MessageHeader *message) |
420 | { | 421 | { |
421 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 422 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
422 | "Core provides inbound data from `%4s' %llu.\n", | 423 | "Core provides inbound data from `%4s' %u.\n", |
423 | GNUNET_i2s (other), ntohs (message->size)); | 424 | GNUNET_i2s (other), |
425 | (unsigned int) ntohs (message->size)); | ||
424 | total_bytes_recv += ntohs (message->size); | 426 | total_bytes_recv += ntohs (message->size); |
425 | return GNUNET_OK; | 427 | return GNUNET_OK; |
426 | } | 428 | } |
427 | 429 | ||
428 | 430 | ||
429 | static int | 431 | static int |
430 | outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, | 432 | outbound_notify (void *cls, |
433 | const struct GNUNET_PeerIdentity *other, | ||
431 | const struct GNUNET_MessageHeader *message) | 434 | const struct GNUNET_MessageHeader *message) |
432 | { | 435 | { |
433 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 436 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
diff --git a/src/dht/test_dht_monitor.c b/src/dht/test_dht_monitor.c index 6b639e341..0e92d0853 100644 --- a/src/dht/test_dht_monitor.c +++ b/src/dht/test_dht_monitor.c | |||
@@ -293,7 +293,8 @@ monitor_put_cb (void *cls, | |||
293 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 293 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
294 | "%u got a PUT message for key %s with %u bytes\n", | 294 | "%u got a PUT message for key %s with %u bytes\n", |
295 | i, | 295 | i, |
296 | GNUNET_h2s (key), size); | 296 | GNUNET_h2s (key), |
297 | (unsigned int) size); | ||
297 | monitor_counter++; | 298 | monitor_counter++; |
298 | } | 299 | } |
299 | 300 | ||
diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c index c3a03668c..f8de3a4df 100644 --- a/src/fs/test_fs_test_lib.c +++ b/src/fs/test_fs_test_lib.c | |||
@@ -64,8 +64,7 @@ do_stop (void *cls) | |||
64 | else | 64 | else |
65 | { | 65 | { |
66 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 66 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
67 | "Finished download, shutting down\n", | 67 | "Finished download, shutting down\n"); |
68 | (unsigned long long) FILESIZE); | ||
69 | } | 68 | } |
70 | if (NULL != fn) | 69 | if (NULL != fn) |
71 | { | 70 | { |
diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c index 2ff495ac3..02d18c373 100644 --- a/src/fs/test_gnunet_service_fs_migration.c +++ b/src/fs/test_gnunet_service_fs_migration.c | |||
@@ -91,8 +91,7 @@ do_stop (void *cls) | |||
91 | fancy); | 91 | fancy); |
92 | GNUNET_free (fancy); | 92 | GNUNET_free (fancy); |
93 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 93 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
94 | "Finished download, shutting down\n", | 94 | "Finished download, shutting down\n"); |
95 | (unsigned long long) FILESIZE); | ||
96 | } | 95 | } |
97 | } | 96 | } |
98 | 97 | ||
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c index 3f6ec2497..3c5120fe7 100644 --- a/src/fs/test_gnunet_service_fs_p2p.c +++ b/src/fs/test_gnunet_service_fs_p2p.c | |||
@@ -82,8 +82,7 @@ do_stop (void *cls) | |||
82 | fancy); | 82 | fancy); |
83 | GNUNET_free (fancy); | 83 | GNUNET_free (fancy); |
84 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 84 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
85 | "Finished download, shutting down\n", | 85 | "Finished download, shutting down\n"); |
86 | (unsigned long long) FILESIZE); | ||
87 | } | 86 | } |
88 | if (NULL != fn) | 87 | if (NULL != fn) |
89 | { | 88 | { |
diff --git a/src/gnsrecord/test_gnsrecord_serialization.c b/src/gnsrecord/test_gnsrecord_serialization.c index 01989b4a4..3edd2bc48 100644 --- a/src/gnsrecord/test_gnsrecord_serialization.c +++ b/src/gnsrecord/test_gnsrecord_serialization.c | |||
@@ -56,16 +56,26 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
56 | } | 56 | } |
57 | res = 0; | 57 | res = 0; |
58 | 58 | ||
59 | len = GNUNET_GNSRECORD_records_get_size(rd_count, src); | 59 | len = GNUNET_GNSRECORD_records_get_size (rd_count, src); |
60 | char rd_ser[len]; | 60 | char rd_ser[len]; |
61 | GNUNET_assert (len == GNUNET_GNSRECORD_records_serialize(rd_count, src, len, rd_ser)); | 61 | GNUNET_assert (len == |
62 | GNUNET_GNSRECORD_records_serialize (rd_count, | ||
63 | src, | ||
64 | len, | ||
65 | rd_ser)); | ||
62 | 66 | ||
63 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Serialized data len: %u\n",len); | 67 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
68 | "Serialized data len: %u\n", | ||
69 | (unsigned int) len); | ||
64 | 70 | ||
65 | GNUNET_assert (rd_ser != NULL); | 71 | GNUNET_assert (rd_ser != NULL); |
66 | 72 | ||
67 | struct GNUNET_GNSRECORD_Data dst[rd_count]; | 73 | struct GNUNET_GNSRECORD_Data dst[rd_count]; |
68 | GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_records_deserialize (len, rd_ser, rd_count, dst)); | 74 | GNUNET_assert (GNUNET_OK == |
75 | GNUNET_GNSRECORD_records_deserialize (len, | ||
76 | rd_ser, | ||
77 | rd_count, | ||
78 | dst)); | ||
69 | 79 | ||
70 | GNUNET_assert (dst != NULL); | 80 | GNUNET_assert (dst != NULL); |
71 | 81 | ||
diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c index 9e042d61b..db58fe525 100644 --- a/src/multicast/test_multicast.c +++ b/src/multicast/test_multicast.c | |||
@@ -201,9 +201,11 @@ tmit_notify (void *cls, size_t *data_size, void *data) | |||
201 | 201 | ||
202 | uint16_t size = strlen (tmit->data[tmit->n]); | 202 | uint16_t size = strlen (tmit->data[tmit->n]); |
203 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 203 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
204 | "Transmit notify data: %u bytes available, " | 204 | "Transmit notify data: %u bytes available, processing fragment %u/%u (size %u).\n", |
205 | "processing fragment %u/%u (size %u).\n", | 205 | (unsigned int) *data_size, |
206 | *data_size, tmit->n + 1, tmit->data_count, size); | 206 | tmit->n + 1, |
207 | tmit->data_count, | ||
208 | size); | ||
207 | if (*data_size < size) | 209 | if (*data_size < size) |
208 | { | 210 | { |
209 | *data_size = 0; | 211 | *data_size = 0; |
@@ -468,9 +470,12 @@ member_recv_message (void *cls, | |||
468 | const struct GNUNET_MULTICAST_MessageHeader *msg) | 470 | const struct GNUNET_MULTICAST_MessageHeader *msg) |
469 | { | 471 | { |
470 | struct MemberClosure *mcls = cls; | 472 | struct MemberClosure *mcls = cls; |
473 | |||
471 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 474 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
472 | "Test #%u: member_recv_message() %u/%u\n", | 475 | "Test #%u: member_recv_message() %u/%u\n", |
473 | test, mcls->n + 1, mcls->msgs_expected); | 476 | test, |
477 | (unsigned int) (mcls->n + 1), | ||
478 | mcls->msgs_expected); | ||
474 | if (++mcls->n != mcls->msgs_expected) | 479 | if (++mcls->n != mcls->msgs_expected) |
475 | return; | 480 | return; |
476 | 481 | ||
diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c index 2582cbf3f..299ed0e09 100644 --- a/src/psycstore/test_psycstore.c +++ b/src/psycstore/test_psycstore.c | |||
@@ -152,11 +152,15 @@ end () | |||
152 | 152 | ||
153 | 153 | ||
154 | void | 154 | void |
155 | state_reset_result (void *cls, int64_t result, | 155 | state_reset_result (void *cls, |
156 | const char *err_msg, uint16_t err_msg_size) | 156 | int64_t result, |
157 | const char *err_msg, | ||
158 | uint16_t err_msg_size) | ||
157 | { | 159 | { |
158 | op = NULL; | 160 | op = NULL; |
159 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_reset_result:\t%d\n", result); | 161 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
162 | "state_reset_result:\t%d\n", | ||
163 | (int) result); | ||
160 | GNUNET_assert (GNUNET_OK == result); | 164 | GNUNET_assert (GNUNET_OK == result); |
161 | 165 | ||
162 | op = GNUNET_PSYCSTORE_state_reset (h, &channel_pub_key, | 166 | op = GNUNET_PSYCSTORE_state_reset (h, &channel_pub_key, |
diff --git a/src/psycutil/psyc_message.c b/src/psycutil/psyc_message.c index 3dba05b3f..9f0a0c7da 100644 --- a/src/psycutil/psyc_message.c +++ b/src/psycutil/psyc_message.c | |||
@@ -267,45 +267,54 @@ GNUNET_PSYC_log_message (enum GNUNET_ErrorType kind, | |||
267 | { | 267 | { |
268 | uint16_t size = ntohs (msg->size); | 268 | uint16_t size = ntohs (msg->size); |
269 | uint16_t type = ntohs (msg->type); | 269 | uint16_t type = ntohs (msg->type); |
270 | GNUNET_log (kind, "Message of type %d and size %u:\n", type, size); | 270 | |
271 | GNUNET_log (kind, | ||
272 | "Message of type %d and size %u:\n", | ||
273 | type, | ||
274 | size); | ||
271 | switch (type) | 275 | switch (type) |
272 | { | 276 | { |
273 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE: | 277 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE: |
274 | { | 278 | { |
275 | struct GNUNET_PSYC_MessageHeader *pmsg | 279 | const struct GNUNET_PSYC_MessageHeader *pmsg |
276 | = (struct GNUNET_PSYC_MessageHeader *) msg; | 280 | = (const struct GNUNET_PSYC_MessageHeader *) msg; |
277 | GNUNET_log (kind, "\tID: %" PRIu64 "\tflags: %x" PRIu32 "\n", | 281 | GNUNET_log (kind, |
278 | GNUNET_ntohll (pmsg->message_id), ntohl (pmsg->flags)); | 282 | "\tID: %" PRIu64 "\tflags: %x" PRIu32 "\n", |
283 | GNUNET_ntohll (pmsg->message_id), | ||
284 | ntohl (pmsg->flags)); | ||
279 | break; | 285 | break; |
280 | } | 286 | } |
281 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD: | 287 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD: |
282 | { | 288 | { |
283 | struct GNUNET_PSYC_MessageMethod *meth | 289 | const struct GNUNET_PSYC_MessageMethod *meth |
284 | = (struct GNUNET_PSYC_MessageMethod *) msg; | 290 | = (const struct GNUNET_PSYC_MessageMethod *) msg; |
285 | GNUNET_log (kind, | 291 | GNUNET_log (kind, |
286 | "\t%.*s\n", | 292 | "\t%.*s\n", |
287 | (int) (size - sizeof (*meth)), | 293 | (int) (size - sizeof (*meth)), |
288 | &meth[1]); | 294 | (const char *) &meth[1]); |
289 | break; | 295 | break; |
290 | } | 296 | } |
291 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER: | 297 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER: |
292 | { | 298 | { |
293 | struct GNUNET_PSYC_MessageModifier *mod | 299 | const struct GNUNET_PSYC_MessageModifier *mod |
294 | = (struct GNUNET_PSYC_MessageModifier *) msg; | 300 | = (const struct GNUNET_PSYC_MessageModifier *) msg; |
295 | uint16_t name_size = ntohs (mod->name_size); | 301 | uint16_t name_size = ntohs (mod->name_size); |
296 | char oper = ' ' < mod->oper ? mod->oper : ' '; | 302 | char oper = ' ' < mod->oper ? mod->oper : ' '; |
297 | GNUNET_log (kind, | 303 | GNUNET_log (kind, |
298 | "\t%c%.*s\t%.*s\n", | 304 | "\t%c%.*s\t%.*s\n", |
299 | oper, | 305 | oper, |
300 | (int) name_size, | 306 | (int) name_size, |
301 | &mod[1], | 307 | (const char *) &mod[1], |
302 | (int) (size - sizeof (*mod) - name_size), | 308 | (int) (size - sizeof (*mod) - name_size), |
303 | ((char *) &mod[1]) + name_size); | 309 | ((const char *) &mod[1]) + name_size); |
304 | break; | 310 | break; |
305 | } | 311 | } |
306 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MOD_CONT: | 312 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MOD_CONT: |
307 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_DATA: | 313 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_DATA: |
308 | GNUNET_log (kind, "\t%.*s\n", size - sizeof (*msg), &msg[1]); | 314 | GNUNET_log (kind, |
315 | "\t%.*s\n", | ||
316 | (int) (size - sizeof (*msg)), | ||
317 | (const char *) &msg[1]); | ||
309 | break; | 318 | break; |
310 | } | 319 | } |
311 | } | 320 | } |
@@ -320,7 +329,8 @@ GNUNET_PSYC_log_message (enum GNUNET_ErrorType kind, | |||
320 | struct GNUNET_PSYC_TransmitHandle * | 329 | struct GNUNET_PSYC_TransmitHandle * |
321 | GNUNET_PSYC_transmit_create (struct GNUNET_CLIENT_MANAGER_Connection *client) | 330 | GNUNET_PSYC_transmit_create (struct GNUNET_CLIENT_MANAGER_Connection *client) |
322 | { | 331 | { |
323 | struct GNUNET_PSYC_TransmitHandle *tmit = GNUNET_malloc (sizeof (*tmit)); | 332 | struct GNUNET_PSYC_TransmitHandle *tmit = GNUNET_new (struct GNUNET_PSYC_TransmitHandle); |
333 | |||
324 | tmit->client = client; | 334 | tmit->client = client; |
325 | return tmit; | 335 | return tmit; |
326 | } | 336 | } |
diff --git a/src/statistics/test_statistics_api_watch_zero_value.c b/src/statistics/test_statistics_api_watch_zero_value.c index 8bf656ed0..fd0c0410b 100644 --- a/src/statistics/test_statistics_api_watch_zero_value.c +++ b/src/statistics/test_statistics_api_watch_zero_value.c | |||
@@ -58,8 +58,11 @@ static int | |||
58 | watch_1 (void *cls, const char *subsystem, const char *name, uint64_t value, | 58 | watch_1 (void *cls, const char *subsystem, const char *name, uint64_t value, |
59 | int is_persistent) | 59 | int is_persistent) |
60 | { | 60 | { |
61 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received value `%s' `%s' %llu\n", | 61 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
62 | subsystem, name, value); | 62 | "Received value `%s' `%s' %llu\n", |
63 | subsystem, | ||
64 | name, | ||
65 | (unsigned long long) value); | ||
63 | GNUNET_assert (0 == strcmp (name, "test-1")); | 66 | GNUNET_assert (0 == strcmp (name, "test-1")); |
64 | if ((0 == value) && (3 == ok)) | 67 | if ((0 == value) && (3 == ok)) |
65 | { | 68 | { |
@@ -88,11 +91,17 @@ watch_1 (void *cls, const char *subsystem, const char *name, uint64_t value, | |||
88 | 91 | ||
89 | 92 | ||
90 | static int | 93 | static int |
91 | watch_2 (void *cls, const char *subsystem, const char *name, uint64_t value, | 94 | watch_2 (void *cls, |
95 | const char *subsystem, | ||
96 | const char *name, | ||
97 | uint64_t value, | ||
92 | int is_persistent) | 98 | int is_persistent) |
93 | { | 99 | { |
94 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received value `%s' `%s' %llu\n", | 100 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
95 | subsystem, name, value); | 101 | "Received value `%s' `%s' %llu\n", |
102 | subsystem, | ||
103 | name, | ||
104 | (unsigned long long) value); | ||
96 | 105 | ||
97 | GNUNET_assert (0 == strcmp (name, "test-2")); | 106 | GNUNET_assert (0 == strcmp (name, "test-2")); |
98 | if ((42 == value) && (1 == ok2)) | 107 | if ((42 == value) && (1 == ok2)) |
@@ -106,7 +115,9 @@ watch_2 (void *cls, const char *subsystem, const char *name, uint64_t value, | |||
106 | } | 115 | } |
107 | else | 116 | else |
108 | { | 117 | { |
109 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received unexpected value %llu\n", value); | 118 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
119 | "Received unexpected value %llu\n", | ||
120 | (unsigned long long) value); | ||
110 | 121 | ||
111 | GNUNET_break (0); | 122 | GNUNET_break (0); |
112 | GNUNET_SCHEDULER_cancel (shutdown_task); | 123 | GNUNET_SCHEDULER_cancel (shutdown_task); |
@@ -136,7 +147,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
136 | GNUNET_STATISTICS_set (h2, "test-2", 42, GNUNET_NO); | 147 | GNUNET_STATISTICS_set (h2, "test-2", 42, GNUNET_NO); |
137 | 148 | ||
138 | shutdown_task = | 149 | shutdown_task = |
139 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &force_shutdown, | 150 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, |
151 | &force_shutdown, | ||
140 | NULL); | 152 | NULL); |
141 | } | 153 | } |
142 | 154 | ||
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c index 61ea2035f..be79d5499 100644 --- a/src/transport/test_plugin_transport.c +++ b/src/transport/test_plugin_transport.c | |||
@@ -381,7 +381,7 @@ test_addr_string (void *cls) | |||
381 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | 381 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, |
382 | "Plugin creates different address length when converting address->string->address: %u != %u\n", | 382 | "Plugin creates different address length when converting address->string->address: %u != %u\n", |
383 | (unsigned int) w->address->address_length, | 383 | (unsigned int) w->address->address_length, |
384 | s2a_len); | 384 | (unsigned int) s2a_len); |
385 | } | 385 | } |
386 | else if (0 != memcmp (s2a, w->address->address, s2a_len)) | 386 | else if (0 != memcmp (s2a, w->address->address, s2a_len)) |
387 | { | 387 | { |