From 371b9f08efcc9b077250b52f6cb42437dc135ce3 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Fri, 17 Oct 2008 09:10:24 +0000 Subject: [PATCH] typefix git-svn-id: file:///svn/unbound/trunk@1307 be551aaa-1e26-0410-a405-d3ace91eadb9 --- daemon/stats.c | 6 +++--- doc/Changelog | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/daemon/stats.c b/daemon/stats.c index 63dec6774..6f67b46a7 100644 --- a/daemon/stats.c +++ b/daemon/stats.c @@ -154,7 +154,7 @@ void server_stats_obtain(struct worker* worker, struct worker* who, struct stats_info* s) { uint8_t *reply = NULL; - size_t len = 0; + uint32_t len = 0; if(worker == who) { /* just fill it in */ server_stats_compile(worker, s); @@ -166,10 +166,10 @@ void server_stats_obtain(struct worker* worker, struct worker* who, verbose(VERB_ALGO, "wait for stats reply"); if(!tube_read_msg(worker->cmd, &reply, &len, 0)) fatal_exit("failed to read stats over cmd channel"); - if(len != sizeof(*s)) + if(len != (uint32_t)sizeof(*s)) fatal_exit("stats on cmd channel wrong length %d %d", (int)len, (int)sizeof(*s)); - memcpy(s, reply, len); + memcpy(s, reply, (size_t)len); free(reply); } diff --git a/doc/Changelog b/doc/Changelog index 8c11885ea..686b89bea 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +17 October 2008: Wouter + - port Leopard/G5: fixup type conversion size_t/uint32. + 16 October 2008: Wouter - Fixup negative TTL values appearing (reported by Attila Nagy).