[master] 361e393 Rename for clarity

[Federico G. Schwindt]

commit 361e393076e22e4681aaa02b30300dc9b256a2c9
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Wed Oct 12 21:50:36 2016 +0100

    Rename for clarity

diff --git a/bin/varnishd/storage/storage.h b/bin/varnishd/storage/storage.h
index 0f85255..db8856b 100644
--- a/bin/varnishd/storage/storage.h
+++ b/bin/varnishd/storage/storage.h
@@ -65,7 +65,7 @@ struct storage {
 typedef void storage_init_f(struct stevedore *, int ac, char * const *av);
 typedef void storage_open_f(struct stevedore *);
 typedef int storage_allocobj_f(struct worker *, const struct stevedore *,
-    struct objcore *, unsigned ltot, int really);
+    struct objcore *, unsigned, int);
 typedef void storage_close_f(const struct stevedore *, int pass);
 typedef int storage_baninfo_f(const struct stevedore *, enum baninfo event,
     const uint8_t *ban, unsigned len);
diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index 6cc8542..2b7bf72 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -505,7 +505,7 @@ smp_allocx(const struct stevedore *st, size_t min_size, size_t max_size,
 
 static int __match_proto__(storage_allocobj_f)
 smp_allocobj(struct worker *wrk, const struct stevedore *stv,
-    struct objcore *oc, unsigned wsl, int really)
+    struct objcore *oc, unsigned wsl, int nuke_limit)
 {
 	struct object *o;
 	struct storage *st;
@@ -518,7 +518,7 @@ smp_allocobj(struct worker *wrk, const struct stevedore *stv,
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
 	CAST_OBJ_NOTNULL(sc, stv->priv, SMP_SC_MAGIC);
-	assert(really >= 0);
+	assert(nuke_limit >= 0);
 
 	/* Don't entertain already dead objects */
 	if (oc->flags & OC_F_DYING)
@@ -532,10 +532,10 @@ smp_allocobj(struct worker *wrk, const struct stevedore *stv,
 	ltot = IRNUP(sc, ltot);
 
 	while (1) {
-		if (really > 0) {
+		if (nuke_limit > 0) {
 			if (!LRU_NukeOne(wrk, stv->lru))
 				return (0);
-			really--;
+			nuke_limit--;
 		}
 		st = smp_allocx(stv, ltot, ltot, &so, &objidx, &sg);
 		if (st != NULL && st->space < ltot) {
@@ -544,7 +544,7 @@ smp_allocobj(struct worker *wrk, const struct stevedore *stv,
 		}
 		if (st != NULL)
 			break;
-		if (!really)
+		if (!nuke_limit)
 			return (0);
 	}
 
diff --git a/bin/varnishd/storage/storage_simple.c b/bin/varnishd/storage/storage_simple.c
index ef427cc..1385927 100644
--- a/bin/varnishd/storage/storage_simple.c
+++ b/bin/varnishd/storage/storage_simple.c
@@ -131,7 +131,7 @@ SML_MkObject(const struct stevedore *stv, struct objcore *oc, void *ptr)
 
 int __match_proto__(storage_allocobj_f)
 SML_allocobj(struct worker *wrk, const struct stevedore *stv,
-    struct objcore *oc, unsigned wsl, int really)
+    struct objcore *oc, unsigned wsl, int nuke_limit)
 {
 	struct object *o;
 	struct storage *st;
@@ -139,13 +139,13 @@ SML_allocobj(struct worker *wrk, const struct stevedore *stv,
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
-	assert(really >= 0);
+	assert(nuke_limit >= 0);
 	ltot = sizeof(struct object) + PRNDUP(wsl);
 	while (1) {
-		if (really > 0) {
+		if (nuke_limit > 0) {
 			if (!LRU_NukeOne(wrk, stv->lru))
 				return (0);
-			really--;
+			nuke_limit--;
 		}
 		AN(stv->sml_alloc);
 		st = stv->sml_alloc(stv, ltot);
@@ -155,7 +155,7 @@ SML_allocobj(struct worker *wrk, const struct stevedore *stv,
 		}
 		if (st != NULL)
 			break;
-		if (!really)
+		if (!nuke_limit)
 			return (0);
 	}
 	AN(st);