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

Quiet flexelint down a bit.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4067 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 4c351bca
......@@ -664,7 +664,7 @@ cnt_hit(struct sess *sp)
if (sp->handling == VCL_RET_DELIVER) {
/* Dispose of any body part of the request */
FetchReqBody(sp);
(void)FetchReqBody(sp);
sp->wrk->bereq = NULL;
sp->step = STP_DELIVER;
return (0);
......@@ -1004,7 +1004,7 @@ cnt_recv(struct sess *sp)
if (sp->esis > 0) {
/* XXX: VSL something */
INCOMPL();
sp->step = STP_DONE;
/* sp->step = STP_DONE; */
return (1);
}
sp->step = STP_PIPE;
......
......@@ -381,6 +381,7 @@ esi_handle_include(struct esi_work *ew)
if ( val.b != val.e ) {
s = Tlen(val) + 1;
c = WS_Alloc(ws, s);
XXXAN(c);
memcpy(c, val.b, Tlen(val));
val.b = c;
val.e = val.b + s;
......
......@@ -48,6 +48,9 @@
#include "shmlog.h"
#include "cache.h"
/*The constability of lck depends on platform pthreads implementation */
/*lint -save -esym(818,lck) */
struct ilck {
unsigned magic;
#define ILCK_MAGIC 0x7b86c8a5
......@@ -190,3 +193,5 @@ LCK_Init(void)
AZ(pthread_mutex_init(&lck_mtx, NULL));
}
/*lint -restore */
......@@ -142,7 +142,7 @@ RES_WriteObj(struct sess *sp)
WRW_Reserve(sp->wrk, &sp->fd);
if (!sp->disable_esi == 0 || sp->esis == 0)
if (sp->disable_esi || !sp->esis)
sp->acct_req.hdrbytes += http_Write(sp->wrk, sp->wrk->resp, 1);
if (!sp->disable_esi && sp->wantbody && !VTAILQ_EMPTY(&sp->obj->esibits)) {
......
......@@ -53,8 +53,11 @@
#include "hash_slinger.h"
#include "cache_backend.h"
/*XXX: sort of a hack, improve the Tcl code in the compiler to avoid */
/*lint -save -esym(818,sp) */
void *vrt_magic_string_end = &vrt_magic_string_end;
char vrt_hostname[255] = "";
static char vrt_hostname[255] = "";
/*--------------------------------------------------------------------*/
......@@ -658,9 +661,9 @@ VRT_r_server_hostname(struct sess *sp)
(void)sp;
if (vrt_hostname[0] == '\0')
gethostname(vrt_hostname, 255);
AZ(gethostname(vrt_hostname, 255));
return (const char*) &vrt_hostname;
return (vrt_hostname);
}
int
......@@ -983,3 +986,4 @@ VRT_memmove(void *dst, const void *src, unsigned len)
(void)memmove(dst, src, len);
}
/*lint -restore */
......@@ -472,7 +472,7 @@ Symbol_hack(const char *a0)
strcpy(s->n, p);
VTAILQ_INSERT_TAIL(&symbols, s, list);
}
pclose(fi);
(void)pclose(fi);
}
}
......
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