diff options
| author |   tb <tb@openbsd.org> | 2020-12-30 08:54:42 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2020-12-30 08:54:42 +0000 |
| commit | 226353c69d0469beecbdb0d6dfdf1391930fe196 (patch) | |
| tree | 794dede227081df8831498aa94f684b777d34177 /lib/libc/regex/cclass.h | |
| parent | Constify the strings in cnames[]. No functional change. (diff) | |
| download | wireguard-openbsd-226353c69d0469beecbdb0d6dfdf1391930fe196.tar.xz wireguard-openbsd-226353c69d0469beecbdb0d6dfdf1391930fe196.zip | |
cclasses[] multis field is always an empty string. Remove it and code
dealing with it. This code was incomplete anyway.
from miod, ok millert
Diffstat (limited to 'lib/libc/regex/cclass.h')
| -rw-r--r-- | lib/libc/regex/cclass.h | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/lib/libc/regex/cclass.h b/lib/libc/regex/cclass.h index 9a1bea88729..267a1edb254 100644 --- a/lib/libc/regex/cclass.h +++ b/lib/libc/regex/cclass.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cclass.h,v 1.6 2020/10/13 04:42:28 guenther Exp $ */ +/* $OpenBSD: cclass.h,v 1.7 2020/12/30 08:54:42 tb Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 Henry Spencer. @@ -39,30 +39,22 @@ static const struct cclass { const char *name; const char *chars; - const char *multis; } cclasses[] = { { "alnum", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ -0123456789", ""} , - { "alpha", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", - ""} , - { "blank", " \t", ""} , +0123456789" }, + { "alpha", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" }, + { "blank", " \t" }, { "cntrl", "\007\b\t\n\v\f\r\1\2\3\4\5\6\16\17\20\21\22\23\24\ -\25\26\27\30\31\32\33\34\35\36\37\177", ""} , - { "digit", "0123456789", ""} , +\25\26\27\30\31\32\33\34\35\36\37\177" }, + { "digit", "0123456789" }, { "graph", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ -0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", - ""} , - { "lower", "abcdefghijklmnopqrstuvwxyz", - ""} , +0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" }, + { "lower", "abcdefghijklmnopqrstuvwxyz" }, { "print", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ -0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ", - ""} , - { "punct", "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", - ""} , - { "space", "\t\n\v\f\r ", ""} , - { "upper", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", - ""} , - { "xdigit", "0123456789ABCDEFabcdef", - ""} , - { NULL, 0, "" } +0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ " }, + { "punct", "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" }, + { "space", "\t\n\v\f\r " }, + { "upper", "ABCDEFGHIJKLMNOPQRSTUVWXYZ" }, + { "xdigit", "0123456789ABCDEFabcdef" }, + { NULL, 0 } }; |