less creative use of types

diff --git a/src/dht/gnunet-dht-driver.c b/src/dht/gnunet-dht-driver.c
index fcf21281d68afdf4ee6085cb3f6a822214a5c891..1e238c6205f9772a8e0c913c01a26cc8a6986325 100644 (file)
--- a/src/dht/gnunet-dht-driver.c
+++ b/src/dht/gnunet-dht-driver.c
@@ -2035,8 +2035,8 @@ setup_puts_and_gets (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
       test_get = GNUNET_malloc(sizeof(struct TestGetContext));
       test_get->uid = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, num_puts);
 #if REMEMBER
-      while (remember[test_get->uid][temp_daemon] == 1)
-        temp_daemon = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, num_peers);
+      while (remember[test_get->uid][temp_daemon] == 1)        
+        temp_daemon = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, num_peers); 
       remember[test_get->uid][temp_daemon] = 1;
 #endif
       test_get->daemon = GNUNET_TESTING_daemon_get(pg, GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, num_peers));

diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index 566629772f0e7c435e79c20716cbd6ee733c5eab..d74309e21635cf66189938736475ab5055099965 100644 (file)
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -954,7 +954,10 @@ static struct GNUNET_TIME_Relative get_average_send_delay()
   }
 
   average_time = GNUNET_TIME_relative_divide(average_time, divisor);
-  fprintf(stderr, "Avg send delay: %u sends is %llu\n", divisor, (long long unsigned int)average_time.abs_value);
+  fprintf(stderr, 
+         "Avg send delay: %u sends is %llu\n",
+         divisor, 
+         (unsigned long long) average_time.abs_value);
   return average_time;
 }
 #endif
@@ -996,7 +999,8 @@ static struct GNUNET_TIME_Relative get_max_send_delay()
   }
 
   if (max_time.rel_value > MAX_REQUEST_TIME.rel_value)
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Max send delay was %llu\n", (long long unsigned int)max_time.rel_value);
+    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Max send delay was %llu\n", 
+              (unsigned long long) max_time.rel_value);
   return max_time;
 }