Commit cfa20ac4 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

More FlexeLint silencing.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@3550 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent f4abf978
...@@ -184,7 +184,7 @@ EXP_Insert(struct object *o) ...@@ -184,7 +184,7 @@ EXP_Insert(struct object *o)
assert(o->entered != 0 && !isnan(o->entered)); assert(o->entered != 0 && !isnan(o->entered));
oe->lru_stamp = o->entered; oe->lru_stamp = o->entered;
update_object_when(o); (void)update_object_when(o);
Lck_Lock(&exp_mtx); Lck_Lock(&exp_mtx);
binheap_insert(exp_heap, oe); binheap_insert(exp_heap, oe);
assert(oe->timer_idx != BINHEAP_NOIDX); assert(oe->timer_idx != BINHEAP_NOIDX);
...@@ -332,7 +332,7 @@ exp_timer(void *arg) ...@@ -332,7 +332,7 @@ exp_timer(void *arg)
WSL(&ww, SLT_Debug, 0, "Attempt Prefetch %u", WSL(&ww, SLT_Debug, 0, "Attempt Prefetch %u",
o->xid); o->xid);
} }
update_object_when(o); (void)update_object_when(o);
Lck_Lock(&exp_mtx); Lck_Lock(&exp_mtx);
binheap_insert(exp_heap, oe); binheap_insert(exp_heap, oe);
assert(oe->timer_idx != BINHEAP_NOIDX); assert(oe->timer_idx != BINHEAP_NOIDX);
......
...@@ -351,7 +351,7 @@ Fetch(struct sess *sp) ...@@ -351,7 +351,7 @@ Fetch(struct sess *sp)
TCP_blocking(vc->fd); /* XXX: we should timeout instead */ TCP_blocking(vc->fd); /* XXX: we should timeout instead */
WRW_Reserve(w, &vc->fd); 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 */ /* Deal with any message-body the request might have */
i = FetchReqBody(sp); i = FetchReqBody(sp);
......
...@@ -228,7 +228,6 @@ struct object * ...@@ -228,7 +228,6 @@ struct object *
HSH_Lookup(struct sess *sp) HSH_Lookup(struct sess *sp)
{ {
struct worker *w; struct worker *w;
struct http *h;
struct objhead *oh; struct objhead *oh;
struct object *o, *busy_o, *grace_o; struct object *o, *busy_o, *grace_o;
...@@ -237,7 +236,6 @@ HSH_Lookup(struct sess *sp) ...@@ -237,7 +236,6 @@ HSH_Lookup(struct sess *sp)
CHECK_OBJ_NOTNULL(sp->http, HTTP_MAGIC); CHECK_OBJ_NOTNULL(sp->http, HTTP_MAGIC);
AN(hash); AN(hash);
w = sp->wrk; w = sp->wrk;
h = sp->http;
HSH_Prealloc(sp); HSH_Prealloc(sp);
SHA256_Final(sp->wrk->nobjhead->digest, sp->wrk->sha256ctx); SHA256_Final(sp->wrk->nobjhead->digest, sp->wrk->sha256ctx);
......
...@@ -796,8 +796,8 @@ http_Unset(struct http *hp, const char *hdr) ...@@ -796,8 +796,8 @@ http_Unset(struct http *hp, const char *hdr)
if (http_IsHdr(&hp->hd[u], hdr)) if (http_IsHdr(&hp->hd[u], hdr))
continue; continue;
if (v != u) { if (v != u) {
memcpy(&hp->hd[v], &hp->hd[u], sizeof hp->hd[v]); memcpy(&hp->hd[v], &hp->hd[u], sizeof *hp->hd);
memcpy(&hp->hdf[v], &hp->hdf[u], sizeof hp->hdf[v]); memcpy(&hp->hdf[v], &hp->hdf[u], sizeof *hp->hdf);
} }
v++; v++;
} }
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
-e459 // unlocked access from func-ptr -e459 // unlocked access from func-ptr
-e454 // mutex not released (...ReleaseLocked) -e454 // mutex not released (...ReleaseLocked)
-e457 // unprotected access -e457 // unprotected access
-e777 // float equality comparison
-esym(458, lbv_assert) // unlocked access -esym(458, lbv_assert) // unlocked access
-esym(458, params) // unlocked access -esym(458, params) // unlocked access
...@@ -56,6 +57,8 @@ ...@@ -56,6 +57,8 @@
-emacro(702, WEXITSTATUS) // signed shift right -emacro(702, WEXITSTATUS) // signed shift right
-efunc(525, VCC_Return_Name) // Negative indent -efunc(525, VCC_Return_Name) // Negative indent
// -header(../../config.h) // -header(../../config.h)
// Fix strchr() semtics, it can only return NULL if arg2 != 0 // Fix strchr() semtics, it can only return NULL if arg2 != 0
......
...@@ -49,7 +49,7 @@ void mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident); ...@@ -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, ...); int mgt_cli_askchild(unsigned *status, char **resp, const char *fmt, ...);
void mgt_cli_start_child(int fdi, int fdo); void mgt_cli_start_child(int fdi, int fdo);
void mgt_cli_stop_child(void); 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 */ /* mgt_param.c */
void MCF_ParamSync(void); void MCF_ParamSync(void);
......
...@@ -454,7 +454,7 @@ telnet_accept(const struct vev *ev, int what) ...@@ -454,7 +454,7 @@ telnet_accept(const struct vev *ev, int what)
return (0); return (0);
} }
int void
mgt_cli_telnet(int dflag, const char *T_arg) mgt_cli_telnet(int dflag, const char *T_arg)
{ {
struct vss_addr **ta; struct vss_addr **ta;
...@@ -494,5 +494,4 @@ mgt_cli_telnet(int dflag, const char *T_arg) ...@@ -494,5 +494,4 @@ mgt_cli_telnet(int dflag, const char *T_arg)
} }
free(addr); free(addr);
free(port); free(port);
return (0);
} }
...@@ -263,7 +263,7 @@ mgt_run_cc(const char *vcl, struct vsb *sb, int C_flag) ...@@ -263,7 +263,7 @@ mgt_run_cc(const char *vcl, struct vsb *sb, int C_flag)
static char * static char *
mgt_VccCompile(struct vsb **sb, const char *b, int C_flag) mgt_VccCompile(struct vsb **sb, const char *b, int C_flag)
{ {
char *vf = NULL; char *vf;
*sb = vsb_newauto(); *sb = vsb_newauto();
XXXAN(*sb); XXXAN(*sb);
......
...@@ -145,7 +145,7 @@ RFC2616_Ttl(const struct sess *sp, const struct http *hp, struct object *obj) ...@@ -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. * derive a relative time from the two headers.
* (the negative ttl case is caught above) * (the negative ttl case is caught above)
*/ */
ttl = (h_expires - h_date); ttl = (int)(h_expires - h_date);
} while (0); } while (0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment