[master] 38dd0df7d Minor NO-OP polish.
Poul-Henning Kamp
phk at FreeBSD.org
Mon Dec 12 13:40:10 UTC 2022
commit 38dd0df7dc0c457dc7b121143cceabdf8fbf8fcb
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Dec 12 13:38:34 2022 +0000
Minor NO-OP polish.
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 75e66ce6d..0a8186861 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -389,7 +389,7 @@ http_Teardown(struct http *hp)
*/
void
-HTTP_Dup(struct http *to, const struct http * const fm)
+HTTP_Dup(struct http *to, const struct http * fm)
{
assert(fm->nhd <= to->shd);
diff --git a/include/vtree.h b/include/vtree.h
index bfa5efcd7..66bfd44cc 100644
--- a/include/vtree.h
+++ b/include/vtree.h
@@ -533,7 +533,7 @@ name##_VRBT_INSERT_COLOR(struct name *head, \
/* \
* Initially, elm is a leaf. Either its parent was previously \
* a leaf, with two black null children, or an interior node \
- * with a black non-null child and a red null child. The \
+ * with a black non-null child and a red null child. The \
* balance criterion "the rank of any leaf is 1" precludes the \
* possibility of two red null children for the initial parent. \
* So the first loop iteration cannot lead to accessing an \
@@ -694,12 +694,12 @@ name##_VRBT_REMOVE_COLOR(struct name *head, \
* par par \
* ╱ ╲ ╱ ╲ \
* ╱ sib elm ╲ \
- * ╱ / ╲ elm* \
- * elm elm* ╲ ╱ ╲ \
+ * ╱ / ╲ elm* \
+ * elm elm* ╲ ╱ ╲ \
* ╱ ╲ ╲ ╱ ╲ \
* ╱ ╲ z ╱ ╲ \
* x y x sib \
- * ╱ ╲ \
+ * ╱ ╲ \
* ╱ z \
* y \
*/ \
diff --git a/lib/libvarnish/vcli_proto.c b/lib/libvarnish/vcli_proto.c
index d7eef5d88..e0fca5cec 100644
--- a/lib/libvarnish/vcli_proto.c
+++ b/lib/libvarnish/vcli_proto.c
@@ -88,8 +88,7 @@ VCLI_WriteResult(int fd, unsigned status, const char *result)
len = strlen(result);
- i = snprintf(res, sizeof res,
- "%-3d %-8zd\n", status, len);
+ i = snprintf(res, sizeof res, "%-3d %-8zd\n", status, len);
assert(i == CLI_LINE0_LEN);
assert(strtoul(res + 3, NULL, 10) == len);
diff --git a/lib/libvarnish/vjsn.c b/lib/libvarnish/vjsn.c
index 62163415a..fc37b4095 100644
--- a/lib/libvarnish/vjsn.c
+++ b/lib/libvarnish/vjsn.c
@@ -356,6 +356,10 @@ vjsn_number(struct vjsn *js)
while (*js->ptr >= '0' && *js->ptr <= '9')
js->ptr++;
}
+ /*
+ * The terminating NUL is supplied by the caller, once they
+ * have decided if they like what occupies that spot.
+ */
return (jsv);
}
diff --git a/lib/libvarnish/vsa.c b/lib/libvarnish/vsa.c
index 90b2713e7..58477a002 100644
--- a/lib/libvarnish/vsa.c
+++ b/lib/libvarnish/vsa.c
@@ -255,7 +255,8 @@ VSA_Malloc(const void *s, unsigned sal)
return (VSA_Build(NULL, s, sal));
}
-/* 'd' SHALL point to vsa_suckaddr_len aligned bytes of storage
+/*
+ * 'd' SHALL point to vsa_suckaddr_len aligned bytes of storage
*
* fam: address family
* a / al : address and length
@@ -466,4 +467,3 @@ VSA_free(const struct suckaddr **vsap)
TAKE_OBJ_NOTNULL(vsa, vsap, SUCKADDR_MAGIC);
free(TRUST_ME(vsa));
}
-
More information about the varnish-commit
mailing list