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

White space fixes



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5574 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 93fa670b
......@@ -303,7 +303,7 @@ vbe_Healthy(const struct vdi_simple *vs, const struct sess *sp)
if (threshold == 0)
return (1);
if (sp->objcore == NULL)
if (sp->objcore == NULL)
return (1);
now = sp->t_req;
......
......@@ -679,7 +679,7 @@ HSH_Deref(struct worker *w, struct objcore *oc, struct object **oo)
w->stats.n_object--;
}
if (oc == NULL)
if (oc == NULL)
return (0);
AN(oh);
......
......@@ -151,10 +151,10 @@ stv_alloc(const struct sess *sp, size_t size)
struct stv_objsecrets {
unsigned magic;
#define STV_OBJ_SECRETES_MAGIC 0x78c87247
unsigned nhttp;
unsigned lhttp;
unsigned nhttp;
unsigned lhttp;
unsigned wsl;
double ttl;
double ttl;
};
/*********************************************************************
......@@ -177,7 +177,7 @@ STV_MkObject(struct sess *sp, void *ptr, unsigned ltot,
assert(PAOK(ptr));
assert(ltot >= sizeof *o + soc->lhttp + soc->wsl);
o = ptr;
o = ptr;
memset(o, 0, sizeof *o);
o->magic = OBJECT_MAGIC;
......
......@@ -702,7 +702,7 @@ smp_oc_updatemeta(struct objcore *oc)
CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
o = smp_oc_getobj(NULL, oc);
AN(o);
CAST_OBJ_NOTNULL(sg, oc->priv, SMP_SEG_MAGIC);
CHECK_OBJ_NOTNULL(sg->sc, SMP_SC_MAGIC);
smp_index = oc->priv2;
......@@ -1439,7 +1439,7 @@ smp_allocobj(struct stevedore *stv, struct sess *sp, unsigned ltot,
o = STV_MkObject(sp, st->ptr, ltot, soc);
CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
o->objstore = st;
oc = o->objcore;
CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
oc->flags |= OC_F_LRUDONTMOVE;
......
......@@ -62,7 +62,7 @@ HTTPH("Accept-Ranges", H_Accept_Ranges, 2, 3, HTTPH_R_FETCH | HTTPH_A_IN
HTTPH("Age", H_Age, 2, 0, HTTPH_A_INS, 0, 0) /* RFC2616 14.6 */
HTTPH("Allow", H_Allow, 2, 0, 0, 0, 0) /* RFC2616 14.7 */
HTTPH("Authorization", H_Authorization, 1, 0, 0, 0, 0) /* RFC2616 14.8 */
HTTPH("Cache-Control", H_Cache_Control, 3, 3, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.9 */
HTTPH("Cache-Control", H_Cache_Control, 3, 3, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.9 */
HTTPH("Connection", H_Connection, 3, 3, HTTPH_R_PASS | HTTPH_A_PASS | HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.10 */
HTTPH("Content-Encoding", H_Content_Encoding, 2, 0, 0, 0, 0) /* RFC2616 14.11 */
HTTPH("Content-Langugae", H_Content_Language, 2, 0, 0, 0, 0) /* RFC2616 14.12 */
......
......@@ -290,10 +290,12 @@ VSS_open(const char *str, double tmo)
struct vss_addr **vaddr;
struct pollfd pfd;
#if 0
retval = VSS_parse(str, &addr, &port);
if (retval < 0)
return (retval);
nvaddr = VSS_resolve(addr, port, &vaddr);
#endif
nvaddr = VSS_resolve(str, NULL, &vaddr);
if (nvaddr <= 0) {
free(addr);
free(port);
......
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