More FlexeLint silencing.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3550 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_expire.c b/varnish-cache/bin/varnishd/cache_expire.c
index eb81a956aec65f6c52a524752d1ef62dc4a5c2a9..f533505f6ee7a2b4be9e4ce374b95fa722fb655e 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_expire.c
+++ b/varnish-cache/bin/varnishd/cache_expire.c
@@ -184,7 +184,7 @@ EXP_Insert(struct object *o)
 
        assert(o->entered != 0 && !isnan(o->entered));
        oe->lru_stamp = o->entered;
-       update_object_when(o);
+       (void)update_object_when(o);
        Lck_Lock(&exp_mtx);
        binheap_insert(exp_heap, oe);
        assert(oe->timer_idx != BINHEAP_NOIDX);
@@ -332,7 +332,7 @@ exp_timer(void *arg)
                                WSL(&ww, SLT_Debug, 0, "Attempt Prefetch %u",
                                    o->xid);
                        }
-                       update_object_when(o);
+                       (void)update_object_when(o);
                        Lck_Lock(&exp_mtx);
                        binheap_insert(exp_heap, oe);
                        assert(oe->timer_idx != BINHEAP_NOIDX);

diff --git a/varnish-cache/bin/varnishd/cache_fetch.c b/varnish-cache/bin/varnishd/cache_fetch.c
index cc7566ebac6a4eb34b9069f7b3d3182136edf484..5cb16f6b6ba56e02366720ddc3f0052b8d37fe6f 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_fetch.c
+++ b/varnish-cache/bin/varnishd/cache_fetch.c
@@ -351,7 +351,7 @@ Fetch(struct sess *sp)
 
        TCP_blocking(vc->fd);   /* XXX: we should timeout instead */
        WRW_Reserve(w, &vc->fd);
-       http_Write(w, hp, 0);   /* XXX: stats ? */
+       (void)http_Write(w, hp, 0);     /* XXX: stats ? */
 
        /* Deal with any message-body the request might have */
        i = FetchReqBody(sp);

diff --git a/varnish-cache/bin/varnishd/cache_hash.c b/varnish-cache/bin/varnishd/cache_hash.c
index eb362dfd8d78b025032f3a695cd7ad8f15707d65..aec29423e84a779ed13a479b743dcbd97fad55b8 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_hash.c
+++ b/varnish-cache/bin/varnishd/cache_hash.c
@@ -228,7 +228,6 @@ struct object *
 HSH_Lookup(struct sess *sp)
 {
        struct worker *w;
-       struct http *h;
        struct objhead *oh;
        struct object *o, *busy_o, *grace_o;
 
@@ -237,7 +236,6 @@ HSH_Lookup(struct sess *sp)
        CHECK_OBJ_NOTNULL(sp->http, HTTP_MAGIC);
        AN(hash);
        w = sp->wrk;
-       h = sp->http;
 
        HSH_Prealloc(sp);
        SHA256_Final(sp->wrk->nobjhead->digest, sp->wrk->sha256ctx);

diff --git a/varnish-cache/bin/varnishd/cache_http.c b/varnish-cache/bin/varnishd/cache_http.c
index 558daa0079d7e69e67c9d18f8a7656a11bf4fdf3..f83da38401f462911d8caf72d880916cdc7797e6 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_http.c
+++ b/varnish-cache/bin/varnishd/cache_http.c
@@ -796,8 +796,8 @@ http_Unset(struct http *hp, const char *hdr)
                if (http_IsHdr(&hp->hd[u], hdr))
                        continue;
                if (v != u) {
-                       memcpy(&hp->hd[v], &hp->hd[u], sizeof hp->hd[v]);
-                       memcpy(&hp->hdf[v], &hp->hdf[u], sizeof hp->hdf[v]);
+                       memcpy(&hp->hd[v], &hp->hd[u], sizeof *hp->hd);
+                       memcpy(&hp->hdf[v], &hp->hdf[u], sizeof *hp->hdf);
                }
                v++;
        }

diff --git a/varnish-cache/bin/varnishd/flint.lnt b/varnish-cache/bin/varnishd/flint.lnt
index 492c71b143be7a3f004412f2c5902f362003e7c8..7d3fbdd289eaf886fb7b8534e80c199b3e148095 100644 (file)
--- a/varnish-cache/bin/varnishd/flint.lnt
+++ b/varnish-cache/bin/varnishd/flint.lnt
@@ -7,6 +7,7 @@
 -e459  // unlocked access from func-ptr
 -e454  // mutex not released (...ReleaseLocked)
 -e457  // unprotected access
+-e777  // float equality comparison
 
 -esym(458, lbv_assert) // unlocked access
 -esym(458, params)     // unlocked access
@@ -56,6 +57,8 @@
 -emacro(702, WEXITSTATUS)      // signed shift right 
 -efunc(525, VCC_Return_Name)   // Negative indent
 
+
+
 // -header(../../config.h)
 
 // Fix strchr() semtics, it can only return NULL if arg2 != 0

diff --git a/varnish-cache/bin/varnishd/mgt.h b/varnish-cache/bin/varnishd/mgt.h
index a64eb26d0f2929a0a009378acd89a940303e679a..cee8dd1bd7d3b255135d4e23d53c83de81dfbdad 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt.h
+++ b/varnish-cache/bin/varnishd/mgt.h
@@ -49,7 +49,7 @@ void mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident);
 int mgt_cli_askchild(unsigned *status, char **resp, const char *fmt, ...);
 void mgt_cli_start_child(int fdi, int fdo);
 void mgt_cli_stop_child(void);
-int mgt_cli_telnet(int dflag, const char *T_arg);
+void mgt_cli_telnet(int dflag, const char *T_arg);
 
 /* mgt_param.c */
 void MCF_ParamSync(void);

diff --git a/varnish-cache/bin/varnishd/mgt_cli.c b/varnish-cache/bin/varnishd/mgt_cli.c
index c8c12d2165ced493a9ffdbcc41837bf980893bca..07b5ce48a8dd536ede7c5a7457a1e1aaf08889f0 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_cli.c
+++ b/varnish-cache/bin/varnishd/mgt_cli.c
@@ -454,7 +454,7 @@ telnet_accept(const struct vev *ev, int what)
        return (0);
 }
 
-int
+void
 mgt_cli_telnet(int dflag, const char *T_arg)
 {
        struct vss_addr **ta;
@@ -494,5 +494,4 @@ mgt_cli_telnet(int dflag, const char *T_arg)
        }
        free(addr);
        free(port);
-       return (0);
 }

diff --git a/varnish-cache/bin/varnishd/mgt_vcc.c b/varnish-cache/bin/varnishd/mgt_vcc.c
index c2aaa2f6f5097ff881f00e379c42ee928369e4f8..c782e71957d1155cfb028ed60ba0dfeab96f8d10 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_vcc.c
+++ b/varnish-cache/bin/varnishd/mgt_vcc.c
@@ -263,7 +263,7 @@ mgt_run_cc(const char *vcl, struct vsb *sb, int C_flag)
 static char *
 mgt_VccCompile(struct vsb **sb, const char *b, int C_flag)
 {
-       char *vf = NULL;
+       char *vf;
 
        *sb = vsb_newauto();
        XXXAN(*sb);

diff --git a/varnish-cache/bin/varnishd/rfc2616.c b/varnish-cache/bin/varnishd/rfc2616.c
index 1c5a2857220ad557500389a70a7315d581d47cbf..5a6c46fc9415c9b117afc688dcb469de2119529a 100644 (file)
--- a/varnish-cache/bin/varnishd/rfc2616.c
+++ b/varnish-cache/bin/varnishd/rfc2616.c
@@ -145,7 +145,7 @@ RFC2616_Ttl(const struct sess *sp, const struct http *hp, struct object *obj)
                 * derive a relative time from the two headers.
                 * (the negative ttl case is caught above)
                 */
-               ttl = (h_expires - h_date);
+               ttl = (int)(h_expires - h_date);
 
        } while (0);