more lint.

git-svn-id: file:///svn/unbound/trunk@4121 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/remote.c b/daemon/remote.c
index 6cca69f29867a0e18807faec1ccb69b62405bbc8..feaa2faee3256eb7fb9e87b603338a77a02a9f5e 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -124,7 +124,7 @@ timeval_subtract(struct timeval* d, const struct timeval* end,
 
 /** divide sum of timers to get average */
 static void
-timeval_divide(struct timeval* avg, const struct timeval* sum, size_t d)
+timeval_divide(struct timeval* avg, const struct timeval* sum, long long d)
 {
 #ifndef S_SPLINT_S
        size_t leftover;
@@ -811,7 +811,7 @@ print_stats(SSL* ssl, const char* nm, struct ub_stats_info* s)
        if(!ssl_printf(ssl, "%s.requestlist.avg"SQ"%g\n", nm,
                (s->svr.num_queries_missed_cache+s->svr.num_queries_prefetch)?
                        (double)s->svr.sum_query_list_size/
-                       (s->svr.num_queries_missed_cache+
+                       (double)(s->svr.num_queries_missed_cache+
                        s->svr.num_queries_prefetch) : 0.0)) return 0;
        if(!ssl_printf(ssl, "%s.requestlist.max"SQ"%lu\n", nm,
                (unsigned long)s->svr.max_query_list_size)) return 0;
@@ -823,8 +823,8 @@ print_stats(SSL* ssl, const char* nm, struct ub_stats_info* s)
                (unsigned long)s->mesh_num_states)) return 0;
        if(!ssl_printf(ssl, "%s.requestlist.current.user"SQ"%lu\n", nm,
                (unsigned long)s->mesh_num_reply_states)) return 0;
-       sumwait.tv_sec = s->mesh_replies_sum_wait_sec;
-       sumwait.tv_usec = s->mesh_replies_sum_wait_usec;
+       sumwait.tv_sec = (size_t)s->mesh_replies_sum_wait_sec;
+       sumwait.tv_usec = (size_t)s->mesh_replies_sum_wait_usec;
        timeval_divide(&avg, &sumwait, s->mesh_replies_sent);
        if(!ssl_printf(ssl, "%s.recursion.time.avg"SQ ARG_LL "d.%6.6d\n", nm,
                (long long)avg.tv_sec, (int)avg.tv_usec)) return 0;

diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index b839b8a025b44c899c00202c4ae0f302bd3bc72b..b8423bce715fb6a578b6125d62187ca7eb0dcd70 100644 (file)
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -161,7 +161,7 @@ usage(void)
 static const int inhibit_zero = 1;
 /** divide sum of timers to get average */
 static void
-timeval_divide(struct timeval* avg, const struct timeval* sum, size_t d)
+timeval_divide(struct timeval* avg, const struct timeval* sum, long long d)
 {
 #ifndef S_SPLINT_S
        size_t leftover;
@@ -211,15 +211,15 @@ static void pr_stats(const char* nm, struct ub_stats_info* s)
        printf("%s.requestlist.avg"SQ"%g\n", nm,
                (s->svr.num_queries_missed_cache+s->svr.num_queries_prefetch)?
                        (double)s->svr.sum_query_list_size/
-                       (s->svr.num_queries_missed_cache+
+                       (double)(s->svr.num_queries_missed_cache+
                        s->svr.num_queries_prefetch) : 0.0);
        PR_UL_NM("requestlist.max", s->svr.max_query_list_size);
        PR_UL_NM("requestlist.overwritten", s->mesh_jostled);
        PR_UL_NM("requestlist.exceeded", s->mesh_dropped);
        PR_UL_NM("requestlist.current.all", s->mesh_num_states);
        PR_UL_NM("requestlist.current.user", s->mesh_num_reply_states);
-       sumwait.tv_sec = s->mesh_replies_sum_wait_sec;
-       sumwait.tv_usec = s->mesh_replies_sum_wait_usec;
+       sumwait.tv_sec = (size_t)s->mesh_replies_sum_wait_sec;
+       sumwait.tv_usec = (size_t)s->mesh_replies_sum_wait_usec;
        timeval_divide(&avg, &sumwait, s->mesh_replies_sent);
        printf("%s.", nm);
        PR_TIMEVAL("recursion.time.avg", avg);