X-Git-Url: https://git.gag.com/?p=debian%2Famanda;a=blobdiff_plain;f=regex-src%2Fregerror.c;h=35cc1eba131a24c827725b5599d23e32eebf05be;hp=ee27c6a1fdd4da862c697615ef9d8ae05ca619bf;hb=1194fb66aa28d9929c3f2bef3cc6c1c3f40a60a4;hpb=2df780bff19c457b0debb7adc29972a0bc2a5dc2

diff --git a/regex-src/regerror.c b/regex-src/regerror.c
index ee27c6a..35cc1eb 100644
--- a/regex-src/regerror.c
+++ b/regex-src/regerror.c
@@ -35,24 +35,24 @@ static struct rerr {
 	char *name;
 	char *explain;
 } rerrs[] = {
-	REG_OKAY,	"REG_OKAY",	"no errors detected",
-	REG_NOMATCH,	"REG_NOMATCH",	"regexec() failed to match",
-	REG_BADPAT,	"REG_BADPAT",	"invalid regular expression",
-	REG_ECOLLATE,	"REG_ECOLLATE",	"invalid collating element",
-	REG_ECTYPE,	"REG_ECTYPE",	"invalid character class",
-	REG_EESCAPE,	"REG_EESCAPE",	"trailing backslash (\\)",
-	REG_ESUBREG,	"REG_ESUBREG",	"invalid backreference number",
-	REG_EBRACK,	"REG_EBRACK",	"brackets ([ ]) not balanced",
-	REG_EPAREN,	"REG_EPAREN",	"parentheses not balanced",
-	REG_EBRACE,	"REG_EBRACE",	"braces not balanced",
-	REG_BADBR,	"REG_BADBR",	"invalid repetition count(s)",
-	REG_ERANGE,	"REG_ERANGE",	"invalid character range",
-	REG_ESPACE,	"REG_ESPACE",	"out of memory",
-	REG_BADRPT,	"REG_BADRPT",	"repetition-operator operand invalid",
-	REG_EMPTY,	"REG_EMPTY",	"empty (sub)expression",
-	REG_ASSERT,	"REG_ASSERT",	"\"can't happen\" -- you found a bug",
-	REG_INVARG,	"REG_INVARG",	"invalid argument to regex routine",
-	-1,		"",		"*** unknown regexp error code ***",
+	{ REG_OKAY,	"REG_OKAY",	"no errors detected"},
+	{ REG_NOMATCH,	"REG_NOMATCH",	"regexec() failed to match"},
+	{ REG_BADPAT,	"REG_BADPAT",	"invalid regular expression"},
+	{ REG_ECOLLATE,	"REG_ECOLLATE",	"invalid collating element"},
+	{ REG_ECTYPE,	"REG_ECTYPE",	"invalid character class"},
+	{ REG_EESCAPE,	"REG_EESCAPE",	"trailing backslash (\\)"},
+	{ REG_ESUBREG,	"REG_ESUBREG",	"invalid backreference number"},
+	{ REG_EBRACK,	"REG_EBRACK",	"brackets ([ ]) not balanced"},
+	{ REG_EPAREN,	"REG_EPAREN",	"parentheses not balanced"},
+	{ REG_EBRACE,	"REG_EBRACE",	"braces not balanced"},
+	{ REG_BADBR,	"REG_BADBR",	"invalid repetition count(s)"},
+	{ REG_ERANGE,	"REG_ERANGE",	"invalid character range"},
+	{ REG_ESPACE,	"REG_ESPACE",	"out of memory"},
+	{ REG_BADRPT,	"REG_BADRPT",	"repetition-operator operand invalid"},
+	{ REG_EMPTY,	"REG_EMPTY",	"empty (sub)expression"},
+	{ REG_ASSERT,	"REG_ASSERT",	"\"can't happen\" -- you found a bug"},
+	{ REG_INVARG,	"REG_INVARG",	"invalid argument to regex routine"},
+	{ -1,		"",		"*** unknown regexp error code ***"}
 };
 
 /*
@@ -85,7 +85,7 @@ size_t errbuf_size;
 				strncpy(convbuf, r->name, sizeof(convbuf)-1);
 				convbuf[sizeof(convbuf)-1] = '\0';
 			} else {
-				ap_snprintf(convbuf, sizeof(convbuf),
+				snprintf(convbuf, sizeof(convbuf),
 					    "REG_0x%x", target);
 			}
 			assert(strlen(convbuf) < sizeof(convbuf));
@@ -125,6 +125,6 @@ int buflen;
 	if (r->code < 0)
 		return("0");
 
-	ap_snprintf(localbuf, buflen, "%d", r->code);
+	snprintf(localbuf, buflen, "%d", r->code);
 	return(localbuf);
 }