cvs: php-src(PHP_5_3) /ext/ereg/regex cclass.h regerror.c

nlopess Fri Jan 25 20:11:53 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/ereg/regex cclass.h regerror.c Log: const'ify more 372 bytes http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/cclass.h?r1=1.4.8.2&r2=1.4.8.3&diff_format=u Index: php-src/ext/ereg/regex/cclass.h diff -u php-src/ext/ereg/regex/cclass.h:1.4.8.2 php-src/ext/ereg/regex/cclass.h:1.4.8.3 --- php-src/ext/ereg/regex/cclass.h:1.4.8.2 Fri Oct 5 15:00:06 2007 +++ php-src/ext/ereg/regex/cclass.h Fri Jan 25 20:11:53 2008 @@ -1,8 +1,8 @@ /* character-class table */ -static struct cclass { - unsigned char *name; - unsigned char *chars; - unsigned char *multis; +static const struct cclass { + const unsigned char *name; + const unsigned char *chars; + const unsigned char *multis; } cclasses[] = { {"alnum", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", ""}, {"alpha", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/regerror.c?r1=1.6.6.3&r2=1.6.6.4&diff_format=u Index: php-src/ext/ereg/regex/regerror.c diff -u php-src/ext/ereg/regex/regerror.c:1.6.6.3 php-src/ext/ereg/regex/regerror.c:1.6.6.4 --- php-src/ext/ereg/regex/regerror.c:1.6.6.3 Thu Jan 24 23:02:07 2008 +++ php-src/ext/ereg/regex/regerror.c Fri Jan 25 20:11:53 2008 @@ -30,10 +30,10 @@ = #define REG_ATOI 255 // convert name to number (!) = #define REG_ITOA 0400 // convert number to name (!) */ -static struct rerr { +static const struct rerr { int code; - char *name; - char *explain; + const char *name; + const char *explain; } rerrs[] = { {REG_OKAY, "REG_OKAY", "no errors detected"}, {REG_NOMATCH, "REG_NOMATCH", "regexec() failed to match"}, @@ -67,10 +67,10 @@ char *errbuf, size_t errbuf_size) { - register struct rerr *r; + register const struct rerr *r; register size_t len; register int target = errcode &~ REG_ITOA; - register char *s; + register const char *s; char convbuf[50]; if (errcode == REG_ATOI) @@ -113,7 +113,7 @@ const regex_t *preg; char *localbuf; { - register struct rerr *r; + register const struct rerr *r; for (r = rerrs; r->code >= 0; r++) if (strcmp(r->name, preg->re_endp) == 0)