From 671d0062c2981dd816f1f4a1a4a512115b70e6fa Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 17 Nov 2008 18:02:09 +0000 Subject: [PATCH] Rename variables to reflect that they are object heads, not objects. git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3400 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- varnish-cache/bin/varnishd/hash_simple_list.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/varnish-cache/bin/varnishd/hash_simple_list.c b/varnish-cache/bin/varnishd/hash_simple_list.c index 5adcc174..1f20ffa5 100644 --- a/varnish-cache/bin/varnishd/hash_simple_list.c +++ b/varnish-cache/bin/varnishd/hash_simple_list.c @@ -46,7 +46,7 @@ struct hsl_entry { VTAILQ_ENTRY(hsl_entry) list; - struct objhead *obj; + struct objhead *oh; unsigned refcnt; }; @@ -73,34 +73,34 @@ hsl_start(void) */ static struct objhead * -hsl_lookup(const struct sess *sp, struct objhead *nobj) +hsl_lookup(const struct sess *sp, struct objhead *noh) { struct hsl_entry *he, *he2; int i; Lck_Lock(&hsl_mtx); VTAILQ_FOREACH(he, &hsl_head, list) { - i = HSH_Compare(sp, he->obj); + i = HSH_Compare(sp, he->oh); if (i < 0) continue; if (i > 0) break; he->refcnt++; - nobj = he->obj; + noh = he->oh; Lck_Unlock(&hsl_mtx); - return (nobj); + return (noh); } - if (nobj != NULL) { + if (noh != NULL) { he2 = calloc(sizeof *he2, 1); XXXAN(he2); - he2->obj = nobj; + he2->oh = noh; he2->refcnt = 1; - nobj->hashpriv = he2; - nobj->hash = malloc(sp->lhashptr); - XXXAN(nobj->hash); - nobj->hashlen = sp->lhashptr; - HSH_Copy(sp, nobj); + noh->hashpriv = he2; + noh->hash = malloc(sp->lhashptr); + XXXAN(noh->hash); + noh->hashlen = sp->lhashptr; + HSH_Copy(sp, noh); if (he != NULL) VTAILQ_INSERT_BEFORE(he, he2, list); @@ -108,7 +108,7 @@ hsl_lookup(const struct sess *sp, struct objhead *nobj) VTAILQ_INSERT_TAIL(&hsl_head, he2, list); } Lck_Unlock(&hsl_mtx); - return (nobj); + return (noh); } /*-------------------------------------------------------------------- -- 2.39.5