[master] 8a58838a3 Add vct_is{upper|lower}()

Poul-Henning Kamp phk at FreeBSD.org
Mon Aug 5 08:38:11 UTC 2019


commit 8a58838a3575407e6140b16bb0a49870988e8444
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 5 08:29:43 2019 +0000

    Add vct_is{upper|lower}()

diff --git a/include/vct.h b/include/vct.h
index 44021f72d..e9cf9be86 100644
--- a/include/vct.h
+++ b/include/vct.h
@@ -45,6 +45,8 @@
 #define VCT_IDENT		(VCT_ALPHA | VCT_DIGIT | VCT_ID)
 #define VCT_VT			(1<<12)
 #define VCT_SPACE		(VCT_LWS | VCT_VT)
+#define VCT_UPPER		(1<<13)
+#define VCT_LOWER		(1<<14)
 
 extern const uint16_t vct_typtab[256];
 
@@ -65,6 +67,8 @@ vct_is(int x, uint16_t y)
 #define vct_isspace(x) vct_is(x, VCT_SPACE)
 #define vct_isdigit(x) vct_is(x, VCT_DIGIT)
 #define vct_isalpha(x) vct_is(x, VCT_ALPHA)
+#define vct_islower(x) vct_is(x, VCT_LOWER)
+#define vct_isupper(x) vct_is(x, VCT_UPPER)
 #define vct_isalnum(x) vct_is(x, VCT_ALPHA | VCT_DIGIT)
 #define vct_issep(x) vct_is(x, VCT_SEPARATOR)
 #define vct_issepctl(x) vct_is(x, VCT_SEPARATOR | VCT_CTL)
diff --git a/lib/libvarnish/vct.c b/lib/libvarnish/vct.c
index a86e2e427..2bb540687 100644
--- a/lib/libvarnish/vct.c
+++ b/lib/libvarnish/vct.c
@@ -41,8 +41,8 @@
 
 /* NB: VCT always operate in ASCII, don't replace 0x0d with \r etc. */
 
-#define VCT_UPALPHA	VCT_ALPHA
-#define VCT_LOALPHA	VCT_ALPHA
+#define VCT_UPALPHA	(VCT_ALPHA | VCT_UPPER)
+#define VCT_LOALPHA	(VCT_ALPHA | VCT_LOWER)
 
 const uint16_t vct_typtab[256] = {
 	[0x00]	=	VCT_CTL,


More information about the varnish-commit mailing list