lint fixes on FreeBSD 7.

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

diff --git a/daemon/worker.c b/daemon/worker.c
index 26241817081a451aea7463cade02400efa74a371..6588bceb6f07802c4741830dc18a0a4f1506ea6e 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -923,7 +923,7 @@ worker_restart_timer(struct worker* worker)
 {
        if(worker->env.cfg->stat_interval > 0) {
                struct timeval tv;
-               tv.tv_sec = worker->env.cfg->stat_interval;
+               tv.tv_sec = (time_t)worker->env.cfg->stat_interval;
                tv.tv_usec = 0;
                comm_timer_set(worker->stat_timer, &tv);
        }

diff --git a/services/outside_network.c b/services/outside_network.c
index b7f844d493dd5e0aafc8f431236df6d8820fe310..a40a03caa084d1eec6089b49f1bde6b68e4740d8 100644 (file)
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -893,7 +893,7 @@ randomize_and_send_udp(struct outside_network* outnet, struct pending* pend,
 
        /* system calls to set timeout after sending UDP to make roundtrip
           smaller. */
-       tv.tv_sec = timeout/1000;
+       tv.tv_sec = (time_t)(timeout/1000);
        tv.tv_usec = (timeout%1000)*1000;
        comm_timer_set(pend->timer, &tv);
        return 1;
@@ -1010,7 +1010,7 @@ pending_tcp_query(struct outside_network* outnet, ldns_buffer* packet,
        w->outnet = outnet;
        w->cb = callback;
        w->cb_arg = callback_arg;
-       tv.tv_sec = timeout;
+       tv.tv_sec = (time_t)timeout;
        tv.tv_usec = 0;
        comm_timer_set(w->timer, &tv);
        if(pend) {
@@ -1549,7 +1549,7 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error,
                (now.tv_sec == sq->last_sent_time.tv_sec &&
                now.tv_usec > sq->last_sent_time.tv_usec)) {
                /* convert from microseconds to milliseconds */
-               int roundtime = (now.tv_sec - sq->last_sent_time.tv_sec)*1000
+               int roundtime = ((int)now.tv_sec - (int)sq->last_sent_time.tv_sec)*1000
                  + ((int)now.tv_usec - (int)sq->last_sent_time.tv_usec)/1000;
                verbose(VERB_ALGO, "measured roundtrip at %d msec", roundtime);
                log_assert(roundtime >= 0);

diff --git a/testcode/delayer.c b/testcode/delayer.c
index 7ab6a974ecac7e7159acc079e1b6f5149f8b2408..9dc4f037b6700bbf85432505abfc875cc67142d0 100644 (file)
--- a/testcode/delayer.c
+++ b/testcode/delayer.c
@@ -991,7 +991,7 @@ service(const char* bind_str, int bindport, const char* serv_str,
        struct timeval delay, reuse;
        ldns_buffer* pkt;
        int i, s, listen_s;
-       delay.tv_sec = delay_msec / 1000;
+       delay.tv_sec = (time_t)(delay_msec / 1000);
        delay.tv_usec = (delay_msec % 1000)*1000;
        reuse = delay; /* reuse is max(4*delay, 1 second) */
        dl_tv_add(&reuse, &delay);

diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index 79b98f89f3f35fe0f1c4378f0807313b76425071..64bc73ed54721b88737f25c691c4c557e0f0b34a 100644 (file)
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -469,7 +469,7 @@ time_passes(struct replay_runtime* runtime, struct replay_moment* mom)
                verbose(VERB_ALGO, "EVAL %s", mom->string);
                sec = atof(xp);
                free(xp);
-               tv.tv_sec = (int)sec;
+               tv.tv_sec = (time_t)sec;
                tv.tv_usec = (int)((sec - (double)tv.tv_sec) *1000000. + 0.5);
        }
        timeval_add(&runtime->now_tv, &tv);