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

tglsfdc · tglsfdc · commit 89ee5b89a6e8 · 2004-04-02T00:41:18.000Z
signed chars...)
diff --git a/contrib/tsearch2/dict_syn.c b/contrib/tsearch2/dict_syn.c
@@ -37,14 +37,14 @@ findwrd(char *in, char **end)
 	char	   *start;
 
 	*end = NULL;
-	while (*in && isspace(*in))
+	while (*in && isspace((unsigned char) *in))
 		in++;
 
 	if (!in)
 		return NULL;
 	start = in;
 
-	while (*in && !isspace(*in))
+	while (*in && !isspace((unsigned char) *in))
 		in++;
 
 	*end = in;
diff --git a/contrib/tsearch2/prs_dcfg.c b/contrib/tsearch2/prs_dcfg.c
@@ -66,12 +66,12 @@ parse_cfgdict(text *in, Map ** m)
 	{
 		if (state == CS_WAITKEY)
 		{
-			if (isalpha(*ptr))
+			if (isalpha((unsigned char) *ptr))
 			{
 				begin = ptr;
 				state = CS_INKEY;
 			}
-			else if (!isspace(*ptr))
+			else if (!isspace((unsigned char) *ptr))
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("syntax error"),
@@ -80,7 +80,7 @@ parse_cfgdict(text *in, Map ** m)
 		}
 		else if (state == CS_INKEY)
 		{
-			if (isspace(*ptr))
+			if (isspace((unsigned char) *ptr))
 			{
 				mptr->key = nstrdup(begin, ptr - begin);
 				state = CS_WAITEQ;
@@ -90,7 +90,7 @@ parse_cfgdict(text *in, Map ** m)
 				mptr->key = nstrdup(begin, ptr - begin);
 				state = CS_WAITVALUE;
 			}
-			else if (!isalpha(*ptr))
+			else if (!isalpha((unsigned char) *ptr))
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("syntax error"),
@@ -101,7 +101,7 @@ parse_cfgdict(text *in, Map ** m)
 		{
 			if (*ptr == '=')
 				state = CS_WAITVALUE;
-			else if (!isspace(*ptr))
+			else if (!isspace((unsigned char) *ptr))
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("syntax error"),
@@ -115,7 +115,7 @@ parse_cfgdict(text *in, Map ** m)
 				begin = ptr + 1;
 				state = CS_INVALUE;
 			}
-			else if (!isspace(*ptr))
+			else if (!isspace((unsigned char) *ptr))
 			{
 				begin = ptr;
 				state = CS_IN2VALUE;
@@ -134,7 +134,7 @@ parse_cfgdict(text *in, Map ** m)
 		}
 		else if (state == CS_IN2VALUE)
 		{
-			if (isspace(*ptr) || *ptr == ',')
+			if (isspace((unsigned char) *ptr) || *ptr == ',')
 			{
 				mptr->value = nstrdup(begin, ptr - begin);
 				mptr++;
@@ -147,7 +147,7 @@ parse_cfgdict(text *in, Map ** m)
 		{
 			if (*ptr == ',')
 				state = CS_WAITKEY;
-			else if (!isspace(*ptr))
+			else if (!isspace((unsigned char) *ptr))
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("syntax error"),
diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c
@@ -310,7 +310,7 @@ gettoken_tsvector(TI_IN_STATE * state)
 		}
 		else if (state->state == INPOSINFO)
 		{
-			if (isdigit(*(state->prsbuf)))
+			if (isdigit((unsigned char) *(state->prsbuf)))
 			{
 				if (state->alen == 0)
 				{
@@ -373,9 +373,10 @@ gettoken_tsvector(TI_IN_STATE * state)
 							 errmsg("syntax error")));
 				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;
-			else if (!isdigit(*(state->prsbuf)))
+			else if (!isdigit((unsigned char) *(state->prsbuf)))
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("syntax error")));

Original file line number	Diff line number	Diff line change
`@@ -66,12 +66,12 @@ parse_cfgdict(text in, Map * m)`
`66`	`66`	`{`
`67`	`67`	`if (state == CS_WAITKEY)`
`68`	`68`	`{`
`69`		`- if (isalpha(*ptr))`
	`69`	`+ if (isalpha((unsigned char) *ptr))`
`70`	`70`	`{`
`71`	`71`	`begin = ptr;`
`72`	`72`	`state = CS_INKEY;`
`73`	`73`	`}`
`74`		`- else if (!isspace(*ptr))`
	`74`	`+ else if (!isspace((unsigned char) *ptr))`
`75`	`75`	`ereport(ERROR,`
`76`	`76`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`77`	`77`	`errmsg("syntax error"),`
`@@ -80,7 +80,7 @@ parse_cfgdict(text in, Map * m)`
`80`	`80`	`}`
`81`	`81`	`else if (state == CS_INKEY)`
`82`	`82`	`{`
`83`		`- if (isspace(*ptr))`
	`83`	`+ if (isspace((unsigned char) *ptr))`
`84`	`84`	`{`
`85`	`85`	`mptr->key = nstrdup(begin, ptr - begin);`
`86`	`86`	`state = CS_WAITEQ;`
`@@ -90,7 +90,7 @@ parse_cfgdict(text in, Map * m)`
`90`	`90`	`mptr->key = nstrdup(begin, ptr - begin);`
`91`	`91`	`state = CS_WAITVALUE;`
`92`	`92`	`}`
`93`		`- else if (!isalpha(*ptr))`
	`93`	`+ else if (!isalpha((unsigned char) *ptr))`
`94`	`94`	`ereport(ERROR,`
`95`	`95`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`96`	`96`	`errmsg("syntax error"),`
`@@ -101,7 +101,7 @@ parse_cfgdict(text in, Map * m)`
`101`	`101`	`{`
`102`	`102`	`if (*ptr == '=')`
`103`	`103`	`state = CS_WAITVALUE;`
`104`		`- else if (!isspace(*ptr))`
	`104`	`+ else if (!isspace((unsigned char) *ptr))`
`105`	`105`	`ereport(ERROR,`
`106`	`106`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`107`	`107`	`errmsg("syntax error"),`
`@@ -115,7 +115,7 @@ parse_cfgdict(text in, Map * m)`
`115`	`115`	`begin = ptr + 1;`
`116`	`116`	`state = CS_INVALUE;`
`117`	`117`	`}`
`118`		`- else if (!isspace(*ptr))`
	`118`	`+ else if (!isspace((unsigned char) *ptr))`
`119`	`119`	`{`
`120`	`120`	`begin = ptr;`
`121`	`121`	`state = CS_IN2VALUE;`
`@@ -134,7 +134,7 @@ parse_cfgdict(text in, Map * m)`
`134`	`134`	`}`
`135`	`135`	`else if (state == CS_IN2VALUE)`
`136`	`136`	`{`
`137`		`- if (isspace(ptr) \|\| ptr == ',')`
	`137`	`+ if (isspace((unsigned char) ptr) \|\| ptr == ',')`
`138`	`138`	`{`
`139`	`139`	`mptr->value = nstrdup(begin, ptr - begin);`
`140`	`140`	`mptr++;`
`@@ -147,7 +147,7 @@ parse_cfgdict(text in, Map * m)`
`147`	`147`	`{`
`148`	`148`	`if (*ptr == ',')`
`149`	`149`	`state = CS_WAITKEY;`
`150`		`- else if (!isspace(*ptr))`
	`150`	`+ else if (!isspace((unsigned char) *ptr))`
`151`	`151`	`ereport(ERROR,`
`152`	`152`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`153`	`153`	`errmsg("syntax error"),`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ gettoken_tsvector(TI_IN_STATE * state)`
`310`	`310`	`}`
`311`	`311`	`else if (state->state == INPOSINFO)`
`312`	`312`	`{`
`313`		`- if (isdigit(*(state->prsbuf)))`
	`313`	`+ if (isdigit((unsigned char) *(state->prsbuf)))`
`314`	`314`	`{`
`315`	`315`	`if (state->alen == 0)`
`316`	`316`	`{`
`@@ -373,9 +373,10 @@ gettoken_tsvector(TI_IN_STATE * state)`
`373`	`373`	`errmsg("syntax error")));`
`374`	`374`	`state->pos[(uint16 ) (state->pos)].weight = 0;`
`375`	`375`	`}`
`376`		`- else if (isspace((state->prsbuf)) \|\| (state->prsbuf) == '\0')`
	`376`	`+ else if (isspace((unsigned char) *(state->prsbuf)) \|\|`
	`377`	`+ *(state->prsbuf) == '\0')`
`377`	`378`	`return 1;`
`378`		`- else if (!isdigit(*(state->prsbuf)))`
	`379`	`+ else if (!isdigit((unsigned char) *(state->prsbuf)))`
`379`	`380`	`ereport(ERROR,`
`380`	`381`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`381`	`382`	`errmsg("syntax error")));`