extra debug for datastore, stats api fix

2 files changed, 9 insertions, 7 deletions

diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c
index bea9ca0ca..dd9850418 100644
--- a/src/statistics/gnunet-statistics.c
+++ b/src/statistics/gnunet-statistics.c
@@ -65,11 +65,13 @@ static int persistent;
 static int
 printer (void *cls,
          const char *subsystem,
-         const char *name, unsigned long long value, int is_persistent)
+         const char *name, 
+         uint64_t value, int is_persistent)
 {
   FPRINTF (stdout,
            "%s%-20s %-40s: %16llu\n",
-           is_persistent ? "!" : " ", subsystem, _(name), value);
+           is_persistent ? "!" : " ", subsystem, _(name),
+           (unsigned long long) value);
   return GNUNET_OK;
 }
 
@@ -127,7 +129,7 @@ run (void *cls,
           ret = 1;
           return;
         }
-      GNUNET_STATISTICS_set (h, name, val, persistent);
+      GNUNET_STATISTICS_set (h, name, (uint64_t) val, persistent);
       GNUNET_STATISTICS_destroy (h);
       return;
     }
diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c
index 335cd4165..21b8ecd8a 100644
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -88,7 +88,7 @@ struct ActionItem
   /**
    * Associated value.
    */
-  unsigned long long value;
+  uint64_t value;
 
   /**
    * Flag for SET/UPDATE actions.
@@ -630,7 +630,7 @@ static void
 add_setter_action (struct GNUNET_STATISTICS_Handle *h,
                    const char *name,
                    int make_persistent,
-                   unsigned long long value, enum ActionType type)
+                   uint64_t value, enum ActionType type)
 {
   struct ActionItem *ai;
   size_t slen;
@@ -674,7 +674,7 @@ add_setter_action (struct GNUNET_STATISTICS_Handle *h,
 void
 GNUNET_STATISTICS_set (struct GNUNET_STATISTICS_Handle *handle,
                        const char *name,
-                       unsigned long long value, int make_persistent)
+                       uint64_t value, int make_persistent)
 {
   add_setter_action (handle, name, make_persistent, value, ACTION_SET);
 }
@@ -692,7 +692,7 @@ GNUNET_STATISTICS_set (struct GNUNET_STATISTICS_Handle *handle,
 void
 GNUNET_STATISTICS_update (struct GNUNET_STATISTICS_Handle *handle,
                           const char *name,
-                          long long delta, int make_persistent)
+                          int64_t delta, int make_persistent)
 {
   add_setter_action (handle, name, make_persistent,
                      (unsigned long long) delta, ACTION_UPDATE);