MFB: const keywording

This commit is contained in:
Nuno Lopes 2008-01-25 20:21:18 +00:00
parent 8cca6b219e
commit d2a2269f55
3 changed files with 12 additions and 12 deletions

View file

@ -1,8 +1,8 @@
/* character-class table */ /* character-class table */
static struct cclass { static const struct cclass {
unsigned char *name; const unsigned char *name;
unsigned char *chars; const unsigned char *chars;
unsigned char *multis; const unsigned char *multis;
} cclasses[] = { } cclasses[] = {
{"alnum", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", ""}, {"alnum", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", ""},
{"alpha", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", {"alpha", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",

View file

@ -30,10 +30,10 @@
= #define REG_ATOI 255 // convert name to number (!) = #define REG_ATOI 255 // convert name to number (!)
= #define REG_ITOA 0400 // convert number to name (!) = #define REG_ITOA 0400 // convert number to name (!)
*/ */
static struct rerr { static const struct rerr {
int code; int code;
char *name; const char *name;
char *explain; const char *explain;
} rerrs[] = { } rerrs[] = {
{REG_OKAY, "REG_OKAY", "no errors detected"}, {REG_OKAY, "REG_OKAY", "no errors detected"},
{REG_NOMATCH, "REG_NOMATCH", "regexec() failed to match"}, {REG_NOMATCH, "REG_NOMATCH", "regexec() failed to match"},
@ -67,10 +67,10 @@ const regex_t *preg,
char *errbuf, char *errbuf,
size_t errbuf_size) size_t errbuf_size)
{ {
register struct rerr *r; register const struct rerr *r;
register size_t len; register size_t len;
register int target = errcode &~ REG_ITOA; register int target = errcode &~ REG_ITOA;
register char *s; register const char *s;
char convbuf[50]; char convbuf[50];
if (errcode == REG_ATOI) if (errcode == REG_ATOI)
@ -113,7 +113,7 @@ regatoi(preg, localbuf)
const regex_t *preg; const regex_t *preg;
char *localbuf; char *localbuf;
{ {
register struct rerr *r; register const struct rerr *r;
for (r = rerrs; r->code >= 0; r++) for (r = rerrs; r->code >= 0; r++)
if (strcmp(r->name, preg->re_endp) == 0) if (strcmp(r->name, preg->re_endp) == 0)

View file

@ -38,7 +38,7 @@ typedef struct filter_list_entry {
} filter_list_entry; } filter_list_entry;
/* {{{ filter_list */ /* {{{ filter_list */
filter_list_entry filter_list[] = { static const filter_list_entry filter_list[] = {
{ "int", FILTER_VALIDATE_INT, php_filter_int }, { "int", FILTER_VALIDATE_INT, php_filter_int },
{ "boolean", FILTER_VALIDATE_BOOLEAN, php_filter_boolean }, { "boolean", FILTER_VALIDATE_BOOLEAN, php_filter_boolean },
{ "float", FILTER_VALIDATE_FLOAT, php_filter_float }, { "float", FILTER_VALIDATE_FLOAT, php_filter_float },
@ -79,7 +79,7 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int
/* {{{ filter_functions[] /* {{{ filter_functions[]
*/ */
const zend_function_entry filter_functions[] = { static const zend_function_entry filter_functions[] = {
PHP_FE(filter_input, NULL) PHP_FE(filter_input, NULL)
PHP_FE(filter_var, NULL) PHP_FE(filter_var, NULL)
PHP_FE(filter_input_array, NULL) PHP_FE(filter_input_array, NULL)