diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-03 14:50:47 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-03 14:50:47 +0000 |
commit | 94a28fbbb8dc035613f34b5703499a8b36229250 (patch) | |
tree | ab8d20718219acfc6d48cac64168f337c323512c | |
parent | 8031f0e2bb9ffb4d9f46d29804514188de1c4027 (diff) | |
download | gnunet-94a28fbbb8dc035613f34b5703499a8b36229250.tar.gz gnunet-94a28fbbb8dc035613f34b5703499a8b36229250.zip |
-fix misc compiler warnings
-rw-r--r-- | po/POTFILES.in | 2 | ||||
-rw-r--r-- | src/ats-tool/gnunet-ats.c | 8 | ||||
-rw-r--r-- | src/ats/gnunet-ats-solver-eval.c | 10 | ||||
-rw-r--r-- | src/datastore/plugin_datastore_sqlite.c | 5 | ||||
-rw-r--r-- | src/transport/gnunet-transport.c | 8 |
5 files changed, 19 insertions, 14 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 63e34b08a..3713aaa47 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -282,11 +282,11 @@ src/sensor/sensor_util_lib_crypto.c | |||
282 | src/set/gnunet-service-set.c | 282 | src/set/gnunet-service-set.c |
283 | src/set/gnunet-service-set_intersection.c | 283 | src/set/gnunet-service-set_intersection.c |
284 | src/set/gnunet-service-set_union.c | 284 | src/set/gnunet-service-set_union.c |
285 | src/set/gnunet-service-set_union_strata_estimator.c | ||
285 | src/set/gnunet-set-ibf-profiler.c | 286 | src/set/gnunet-set-ibf-profiler.c |
286 | src/set/gnunet-set-profiler.c | 287 | src/set/gnunet-set-profiler.c |
287 | src/set/ibf.c | 288 | src/set/ibf.c |
288 | src/set/set_api.c | 289 | src/set/set_api.c |
289 | src/set/strata_estimator.c | ||
290 | src/social/gnunet-service-social.c | 290 | src/social/gnunet-service-social.c |
291 | src/social/social_api.c | 291 | src/social/social_api.c |
292 | src/statistics/gnunet-service-statistics.c | 292 | src/statistics/gnunet-service-statistics.c |
diff --git a/src/ats-tool/gnunet-ats.c b/src/ats-tool/gnunet-ats.c index 5cb52d177..767473141 100644 --- a/src/ats-tool/gnunet-ats.c +++ b/src/ats-tool/gnunet-ats.c | |||
@@ -355,17 +355,17 @@ transport_addr_to_str_cb (void *cls, | |||
355 | { | 355 | { |
356 | case GNUNET_SYSERR: | 356 | case GNUNET_SYSERR: |
357 | FPRINTF (stderr, | 357 | FPRINTF (stderr, |
358 | "Failed to convert address for peer `%s' plugin `%s' length %lu to string (communication error)\n", | 358 | "Failed to convert address for peer `%s' plugin `%s' length %u to string (communication error)\n", |
359 | GNUNET_i2s (&pr->address->peer), | 359 | GNUNET_i2s (&pr->address->peer), |
360 | pr->address->transport_name, | 360 | pr->address->transport_name, |
361 | pr->address->address_length); | 361 | (unsigned int) pr->address->address_length); |
362 | return; | 362 | return; |
363 | case GNUNET_NO: | 363 | case GNUNET_NO: |
364 | FPRINTF (stderr, | 364 | FPRINTF (stderr, |
365 | "Failed to convert address for peer `%s' plugin `%s' length %lu to string (address invalid or not supported)\n", | 365 | "Failed to convert address for peer `%s' plugin `%s' length %u to string (address invalid or not supported)\n", |
366 | GNUNET_i2s (&pr->address->peer), | 366 | GNUNET_i2s (&pr->address->peer), |
367 | pr->address->transport_name, | 367 | pr->address->transport_name, |
368 | pr->address->address_length); | 368 | (unsigned int) pr->address->address_length); |
369 | return; | 369 | return; |
370 | case GNUNET_OK: | 370 | case GNUNET_OK: |
371 | /* continues below */ | 371 | /* continues below */ |
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index fbcd14a9c..17bdf6b15 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c | |||
@@ -818,10 +818,10 @@ GNUNET_ATS_solver_generate_property_stop_all () | |||
818 | /** | 818 | /** |
819 | * Preference Generators | 819 | * Preference Generators |
820 | */ | 820 | */ |
821 | |||
822 | static struct PreferenceGenerator *pref_gen_head; | 821 | static struct PreferenceGenerator *pref_gen_head; |
823 | static struct PreferenceGenerator *pref_gen_tail; | 822 | static struct PreferenceGenerator *pref_gen_tail; |
824 | 823 | ||
824 | |||
825 | static double | 825 | static double |
826 | get_preference (struct PreferenceGenerator *pg) | 826 | get_preference (struct PreferenceGenerator *pg) |
827 | { | 827 | { |
@@ -902,7 +902,8 @@ set_feedback_task (void *cls, | |||
902 | return; | 902 | return; |
903 | } | 903 | } |
904 | 904 | ||
905 | switch (pg->kind) { | 905 | switch (pg->kind) |
906 | { | ||
906 | case GNUNET_ATS_PREFERENCE_BANDWIDTH: | 907 | case GNUNET_ATS_PREFERENCE_BANDWIDTH: |
907 | dur = GNUNET_TIME_absolute_get_duration(pg->feedback_last_bw_update); | 908 | dur = GNUNET_TIME_absolute_get_duration(pg->feedback_last_bw_update); |
908 | bw_acc_in = dur.rel_value_us *pg->last_assigned_bw_in + pg->feedback_bw_in_acc; | 909 | bw_acc_in = dur.rel_value_us *pg->last_assigned_bw_in + pg->feedback_bw_in_acc; |
@@ -925,6 +926,8 @@ set_feedback_task (void *cls, | |||
925 | 926 | ||
926 | break; | 927 | break; |
927 | default: | 928 | default: |
929 | GNUNET_break (0); | ||
930 | feedback = 0.0; | ||
928 | break; | 931 | break; |
929 | } | 932 | } |
930 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 933 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, |
@@ -950,9 +953,10 @@ set_feedback_task (void *cls, | |||
950 | &set_feedback_task, pg); | 953 | &set_feedback_task, pg); |
951 | } | 954 | } |
952 | 955 | ||
956 | |||
953 | static void | 957 | static void |
954 | set_pref_task (void *cls, | 958 | set_pref_task (void *cls, |
955 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 959 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
956 | { | 960 | { |
957 | struct PreferenceGenerator *pg = cls; | 961 | struct PreferenceGenerator *pg = cls; |
958 | struct TestPeer *p; | 962 | struct TestPeer *p; |
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index 5ece7cd17..ae57c6aa0 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c | |||
@@ -496,8 +496,9 @@ sqlite_plugin_put (void *cls, | |||
496 | return GNUNET_SYSERR; | 496 | return GNUNET_SYSERR; |
497 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", | 497 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", |
498 | "Storing in database block with type %u/key `%s'/priority %u/expiration in %s (%s).\n", | 498 | "Storing in database block with type %u/key `%s'/priority %u/expiration in %s (%s).\n", |
499 | type, GNUNET_h2s (key), priority, | 499 | type, |
500 | (unsigned long long) | 500 | GNUNET_h2s (key), |
501 | priority, | ||
501 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (expiration), | 502 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (expiration), |
502 | GNUNET_YES), | 503 | GNUNET_YES), |
503 | GNUNET_STRINGS_absolute_time_to_string (expiration)); | 504 | GNUNET_STRINGS_absolute_time_to_string (expiration)); |
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index 646b8087b..7adbf4c32 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c | |||
@@ -799,10 +799,10 @@ process_validation_string (void *cls, | |||
799 | if (GNUNET_SYSERR == res) | 799 | if (GNUNET_SYSERR == res) |
800 | { | 800 | { |
801 | FPRINTF (stderr, | 801 | FPRINTF (stderr, |
802 | "Failed to convert address for peer `%s' plugin `%s' length %lu to string \n", | 802 | "Failed to convert address for peer `%s' plugin `%s' length %u to string \n", |
803 | GNUNET_i2s (&vc->id), | 803 | GNUNET_i2s (&vc->id), |
804 | vc->addrcp->transport_name, | 804 | vc->addrcp->transport_name, |
805 | vc->addrcp->address_length); | 805 | (unsigned int) vc->addrcp->address_length); |
806 | } | 806 | } |
807 | if (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us == vc->valid_until.abs_value_us) | 807 | if (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us == vc->valid_until.abs_value_us) |
808 | s_valid = GNUNET_strdup ("never"); | 808 | s_valid = GNUNET_strdup ("never"); |
@@ -1368,10 +1368,10 @@ process_peer_string (void *cls, | |||
1368 | if (GNUNET_SYSERR == res) | 1368 | if (GNUNET_SYSERR == res) |
1369 | { | 1369 | { |
1370 | FPRINTF (stderr, | 1370 | FPRINTF (stderr, |
1371 | "Failed to convert address for peer `%s' plugin `%s' length %lu to string \n", | 1371 | "Failed to convert address for peer `%s' plugin `%s' length %u to string \n", |
1372 | GNUNET_i2s (&rc->id), | 1372 | GNUNET_i2s (&rc->id), |
1373 | rc->addrcp->transport_name, | 1373 | rc->addrcp->transport_name, |
1374 | rc->addrcp->address_length); | 1374 | (unsigned int) rc->addrcp->address_length); |
1375 | print_info (&rc->id, | 1375 | print_info (&rc->id, |
1376 | rc->transport, | 1376 | rc->transport, |
1377 | NULL, | 1377 | NULL, |