Yet another place where someone was being careless about the arguments
of <ctype.h> macros.
This commit is contained in:
parent
a28961d5e0
commit
6ad853b975
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.110 2004/08/29 05:06:49 momjian Exp $
|
* $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.111 2004/09/02 20:05:40 tgl Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -543,7 +543,7 @@ ArrayCount(char *str, int *dim, char typdelim)
|
|||||||
itemdone = true;
|
itemdone = true;
|
||||||
nelems[nest_level - 1]++;
|
nelems[nest_level - 1]++;
|
||||||
}
|
}
|
||||||
else if (!isspace(*ptr))
|
else if (!isspace((unsigned char) *ptr))
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Other non-space characters must be after a
|
* Other non-space characters must be after a
|
||||||
@ -572,7 +572,7 @@ ArrayCount(char *str, int *dim, char typdelim)
|
|||||||
/* only whitespace is allowed after the closing brace */
|
/* only whitespace is allowed after the closing brace */
|
||||||
while (*ptr)
|
while (*ptr)
|
||||||
{
|
{
|
||||||
if (!isspace(*ptr++))
|
if (!isspace((unsigned char) *ptr++))
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
|
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
|
||||||
errmsg("malformed array literal: \"%s\"", str)));
|
errmsg("malformed array literal: \"%s\"", str)));
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*
|
*
|
||||||
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
|
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
|
||||||
*
|
*
|
||||||
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.30 2004/08/29 05:06:53 momjian Exp $
|
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.31 2004/09/02 20:07:50 tgl Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -355,21 +355,21 @@ test_postmaster_connection(void)
|
|||||||
for (p = post_opts; *p;)
|
for (p = post_opts; *p;)
|
||||||
{
|
{
|
||||||
/* advance past whitespace/quoting */
|
/* advance past whitespace/quoting */
|
||||||
while (isspace(*p) || *p == '\'' || *p == '"')
|
while (isspace((unsigned char) *p) || *p == '\'' || *p == '"')
|
||||||
p++;
|
p++;
|
||||||
|
|
||||||
if (strncmp(p, "-p", strlen("-p")) == 0)
|
if (strncmp(p, "-p", strlen("-p")) == 0)
|
||||||
{
|
{
|
||||||
p += strlen("-p");
|
p += strlen("-p");
|
||||||
/* advance past whitespace/quoting */
|
/* advance past whitespace/quoting */
|
||||||
while (isspace(*p) || *p == '\'' || *p == '"')
|
while (isspace((unsigned char) *p) || *p == '\'' || *p == '"')
|
||||||
p++;
|
p++;
|
||||||
StrNCpy(portstr, p, Min(strcspn(p, "\"'" WHITESPACE) + 1,
|
StrNCpy(portstr, p, Min(strcspn(p, "\"'" WHITESPACE) + 1,
|
||||||
sizeof(portstr)));
|
sizeof(portstr)));
|
||||||
/* keep looking, maybe there is another -p */
|
/* keep looking, maybe there is another -p */
|
||||||
}
|
}
|
||||||
/* Advance to next whitespace */
|
/* Advance to next whitespace */
|
||||||
while (*p && !isspace(*p))
|
while (*p && !isspace((unsigned char) *p))
|
||||||
p++;
|
p++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -385,17 +385,17 @@ test_postmaster_connection(void)
|
|||||||
{
|
{
|
||||||
p = *optlines;
|
p = *optlines;
|
||||||
|
|
||||||
while (isspace(*p))
|
while (isspace((unsigned char) *p))
|
||||||
p++;
|
p++;
|
||||||
if (strncmp(p, "port", strlen("port")) != 0)
|
if (strncmp(p, "port", strlen("port")) != 0)
|
||||||
continue;
|
continue;
|
||||||
p += strlen("port");
|
p += strlen("port");
|
||||||
while (isspace(*p))
|
while (isspace((unsigned char) *p))
|
||||||
p++;
|
p++;
|
||||||
if (*p != '=')
|
if (*p != '=')
|
||||||
continue;
|
continue;
|
||||||
p++;
|
p++;
|
||||||
while (isspace(*p))
|
while (isspace((unsigned char) *p))
|
||||||
p++;
|
p++;
|
||||||
StrNCpy(portstr, p, Min(strcspn(p, "#" WHITESPACE) + 1,
|
StrNCpy(portstr, p, Min(strcspn(p, "#" WHITESPACE) + 1,
|
||||||
sizeof(portstr)));
|
sizeof(portstr)));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user