From: Christian Grothoff Date: Mon, 8 Nov 2010 14:59:05 +0000 (+0000) Subject: less creative use of types X-Git-Tag: initial-import-from-subversion-38251~19794 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d7d280773d90d62408dd3a93ce72745bd1541dc8;p=oweals%2Fgnunet.git less creative use of types --- diff --git a/src/dht/gnunet-dht-driver.c b/src/dht/gnunet-dht-driver.c index fcf21281d..1e238c620 100644 --- 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 566629772..d74309e21 100644 --- 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; }