rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some more compatibility issues (ctype.h macros must never be passed 

signed chars...)
This commit is contained in:
Tom Lane 2004-04-02 00:41:18 +00:00
parent eeaef25ad6
commit 89ee5b89a6
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/tsearch2/dict_syn.c
View File

@ -37,14 +37,14 @@ findwrd(char *in, char **end)
char *start; char *start;
*end = NULL; *end = NULL;
while (*in && isspace(*in)) while (*in && isspace((unsigned char) *in))
in++; in++;
if (!in) if (!in)
return NULL; return NULL;
start = in; start = in;
while (*in && !isspace(*in)) while (*in && !isspace((unsigned char) *in))
in++; in++;
*end = in; *end = in;

16
contrib/tsearch2/prs_dcfg.c
View File

@ -66,12 +66,12 @@ parse_cfgdict(text *in, Map ** m)
{ {
if (state == CS_WAITKEY) if (state == CS_WAITKEY)
{ {
if (isalpha(*ptr)) if (isalpha((unsigned char) *ptr))
{ {
begin = ptr; begin = ptr;
state = CS_INKEY; state = CS_INKEY;
} }
else if (!isspace(*ptr)) else if (!isspace((unsigned char) *ptr))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("syntax error"), errmsg("syntax error"),
@ -80,7 +80,7 @@ parse_cfgdict(text *in, Map ** m)
} }
else if (state == CS_INKEY) else if (state == CS_INKEY)
{ {
if (isspace(*ptr)) if (isspace((unsigned char) *ptr))
{ {
mptr->key = nstrdup(begin, ptr - begin); mptr->key = nstrdup(begin, ptr - begin);
state = CS_WAITEQ; state = CS_WAITEQ;
@ -90,7 +90,7 @@ parse_cfgdict(text *in, Map ** m)
mptr->key = nstrdup(begin, ptr - begin); mptr->key = nstrdup(begin, ptr - begin);
state = CS_WAITVALUE; state = CS_WAITVALUE;
} }
else if (!isalpha(*ptr)) else if (!isalpha((unsigned char) *ptr))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("syntax error"), errmsg("syntax error"),
@ -101,7 +101,7 @@ parse_cfgdict(text *in, Map ** m)
{ {
if (*ptr == '=') if (*ptr == '=')
state = CS_WAITVALUE; state = CS_WAITVALUE;
else if (!isspace(*ptr)) else if (!isspace((unsigned char) *ptr))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("syntax error"), errmsg("syntax error"),
@ -115,7 +115,7 @@ parse_cfgdict(text *in, Map ** m)
begin = ptr + 1; begin = ptr + 1;
state = CS_INVALUE; state = CS_INVALUE;
} }
else if (!isspace(*ptr)) else if (!isspace((unsigned char) *ptr))
{ {
begin = ptr; begin = ptr;
state = CS_IN2VALUE; state = CS_IN2VALUE;
@ -134,7 +134,7 @@ parse_cfgdict(text *in, Map ** m)
} }
else if (state == CS_IN2VALUE) else if (state == CS_IN2VALUE)
{ {
if (isspace(*ptr) || *ptr == ',') if (isspace((unsigned char) *ptr) || *ptr == ',')
{ {
mptr->value = nstrdup(begin, ptr - begin); mptr->value = nstrdup(begin, ptr - begin);
mptr++; mptr++;
@ -147,7 +147,7 @@ parse_cfgdict(text *in, Map ** m)
{ {
if (*ptr == ',') if (*ptr == ',')
state = CS_WAITKEY; state = CS_WAITKEY;
else if (!isspace(*ptr)) else if (!isspace((unsigned char) *ptr))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("syntax error"), errmsg("syntax error"),

7
contrib/tsearch2/tsvector.c
View File

@ -310,7 +310,7 @@ gettoken_tsvector(TI_IN_STATE * state)
} }
else if (state->state == INPOSINFO) else if (state->state == INPOSINFO)
{ {
if (isdigit(*(state->prsbuf))) if (isdigit((unsigned char) *(state->prsbuf)))
{ {
if (state->alen == 0) if (state->alen == 0)
{ {
@ -373,9 +373,10 @@ gettoken_tsvector(TI_IN_STATE * state)
errmsg("syntax error"))); errmsg("syntax error")));
state->pos[*(uint16 *) (state->pos)].weight = 0; state->pos[*(uint16 *) (state->pos)].weight = 0;
} }
else if (isspace(*(state->prsbuf)) || *(state->prsbuf) == '\0') else if (isspace((unsigned char) *(state->prsbuf)) ||
*(state->prsbuf) == '\0')
return 1; return 1;
else if (!isdigit(*(state->prsbuf))) else if (!isdigit((unsigned char) *(state->prsbuf)))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("syntax error"))); errmsg("syntax error")));