[GNUnet-SVN] r34466 - in gnunet: po src/ats src/ats-tool src/datastore src/transport

[gnunet]

Author: grothoff
Date: 2014-12-03 15:50:47 +0100 (Wed, 03 Dec 2014)
New Revision: 34466

Modified:
   gnunet/po/POTFILES.in
   gnunet/src/ats-tool/gnunet-ats.c
   gnunet/src/ats/gnunet-ats-solver-eval.c
   gnunet/src/datastore/plugin_datastore_sqlite.c
   gnunet/src/transport/gnunet-transport.c
Log:
-fix misc compiler warnings

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2014-12-03 14:34:43 UTC (rev 34465)
+++ gnunet/po/POTFILES.in       2014-12-03 14:50:47 UTC (rev 34466)
@@ -282,11 +282,11 @@
 src/set/gnunet-service-set.c
 src/set/gnunet-service-set_intersection.c
 src/set/gnunet-service-set_union.c
+src/set/gnunet-service-set_union_strata_estimator.c
 src/set/gnunet-set-ibf-profiler.c
 src/set/gnunet-set-profiler.c
 src/set/ibf.c
 src/set/set_api.c
-src/set/strata_estimator.c
 src/social/gnunet-service-social.c
 src/social/social_api.c
 src/statistics/gnunet-service-statistics.c

Modified: gnunet/src/ats/gnunet-ats-solver-eval.c
===================================================================
--- gnunet/src/ats/gnunet-ats-solver-eval.c     2014-12-03 14:34:43 UTC (rev 
34465)
+++ gnunet/src/ats/gnunet-ats-solver-eval.c     2014-12-03 14:50:47 UTC (rev 
34466)
@@ -818,10 +818,10 @@
 /**
  * Preference Generators
  */
-
 static struct PreferenceGenerator *pref_gen_head;
 static struct PreferenceGenerator *pref_gen_tail;
 
+
 static double
 get_preference (struct PreferenceGenerator *pg)
 {
@@ -902,7 +902,8 @@
     return;
   }
 
-  switch (pg->kind) {
+  switch (pg->kind)
+  {
     case GNUNET_ATS_PREFERENCE_BANDWIDTH:
       dur = GNUNET_TIME_absolute_get_duration(pg->feedback_last_bw_update);
       bw_acc_in = dur.rel_value_us *pg->last_assigned_bw_in +  
pg->feedback_bw_in_acc;
@@ -925,6 +926,8 @@
 
       break;
     default:
+      GNUNET_break (0);
+      feedback = 0.0;
       break;
   }
   GNUNET_log(GNUNET_ERROR_TYPE_INFO,
@@ -950,9 +953,10 @@
       &set_feedback_task, pg);
 }
 
+
 static void
 set_pref_task (void *cls,
-                    const struct GNUNET_SCHEDULER_TaskContext *tc)
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct PreferenceGenerator *pg = cls;
   struct TestPeer *p;

Modified: gnunet/src/ats-tool/gnunet-ats.c
===================================================================
--- gnunet/src/ats-tool/gnunet-ats.c    2014-12-03 14:34:43 UTC (rev 34465)
+++ gnunet/src/ats-tool/gnunet-ats.c    2014-12-03 14:50:47 UTC (rev 34466)
@@ -355,17 +355,17 @@
   {
   case GNUNET_SYSERR:
     FPRINTF (stderr,
-             "Failed to convert address for peer `%s' plugin `%s' length %lu 
to string (communication error)\n",
+             "Failed to convert address for peer `%s' plugin `%s' length %u to 
string (communication error)\n",
              GNUNET_i2s (&pr->address->peer),
              pr->address->transport_name,
-             pr->address->address_length);
+             (unsigned int) pr->address->address_length);
     return;
   case GNUNET_NO:
     FPRINTF (stderr,
-             "Failed to convert address for peer `%s' plugin `%s' length %lu 
to string (address invalid or not supported)\n",
+             "Failed to convert address for peer `%s' plugin `%s' length %u to 
string (address invalid or not supported)\n",
              GNUNET_i2s (&pr->address->peer),
              pr->address->transport_name,
-             pr->address->address_length);
+             (unsigned int) pr->address->address_length);
     return;
   case GNUNET_OK:
     /* continues below */

Modified: gnunet/src/datastore/plugin_datastore_sqlite.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_sqlite.c      2014-12-03 14:34:43 UTC 
(rev 34465)
+++ gnunet/src/datastore/plugin_datastore_sqlite.c      2014-12-03 14:50:47 UTC 
(rev 34466)
@@ -496,8 +496,9 @@
     return GNUNET_SYSERR;
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite",
                    "Storing in database block with type %u/key `%s'/priority 
%u/expiration in %s (%s).\n",
-                   type, GNUNET_h2s (key), priority,
-                   (unsigned long long)
+                   type,
+                   GNUNET_h2s (key),
+                   priority,
                    GNUNET_STRINGS_relative_time_to_string 
(GNUNET_TIME_absolute_get_remaining (expiration),
                                                           GNUNET_YES),
                    GNUNET_STRINGS_absolute_time_to_string (expiration));

Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c     2014-12-03 14:34:43 UTC (rev 
34465)
+++ gnunet/src/transport/gnunet-transport.c     2014-12-03 14:50:47 UTC (rev 
34466)
@@ -799,10 +799,10 @@
     if (GNUNET_SYSERR == res)
     {
       FPRINTF (stderr,
-               "Failed to convert address for peer `%s' plugin `%s' length %lu 
to string \n",
+               "Failed to convert address for peer `%s' plugin `%s' length %u 
to string \n",
                GNUNET_i2s (&vc->id),
                vc->addrcp->transport_name,
-               vc->addrcp->address_length);
+               (unsigned int) vc->addrcp->address_length);
     }
     if (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us == vc->valid_until.abs_value_us)
       s_valid = GNUNET_strdup ("never");
@@ -1368,10 +1368,10 @@
     if (GNUNET_SYSERR == res)
     {
       FPRINTF (stderr,
-               "Failed to convert address for peer `%s' plugin `%s' length %lu 
to string \n",
+               "Failed to convert address for peer `%s' plugin `%s' length %u 
to string \n",
                GNUNET_i2s (&rc->id),
                rc->addrcp->transport_name,
-               rc->addrcp->address_length);
+               (unsigned int) rc->addrcp->address_length);
       print_info (&rc->id,
                   rc->transport,
                   NULL,