diff options
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/ecpg/preproc/pgc.l | 8 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 19 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-exec.c | 6 |
3 files changed, 15 insertions, 18 deletions
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index 82daf7188d5..aa741fd5929 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.58 2000/04/05 09:05:34 meskes Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.59 2000/06/14 18:17:54 petere Exp $ * *------------------------------------------------------------------------- */ @@ -491,7 +491,7 @@ cppline {space}*#(.*\\{line_end})*.* /* this should leave the last byte set to '\0' */ strncpy(lower_text, yytext, NAMEDATALEN-1); for(i = 0; lower_text[i]; i++) - if (isascii((unsigned char)lower_text[i]) && isupper(lower_text[i])) + if (isascii((int)lower_text[i]) && isupper((int) lower_text[i])) lower_text[i] = tolower(lower_text[i]); if (i >= NAMEDATALEN) @@ -682,7 +682,7 @@ cppline {space}*#(.*\\{line_end})*.* /* skip the ";" and trailing whitespace. Note that yytext contains at least one non-space character plus the ";" */ - for ( i = strlen(yytext)-2; i > 0 && isspace(yytext[i]); i-- ) {} + for ( i = strlen(yytext)-2; i > 0 && isspace((int) yytext[i]); i-- ) {} yytext[i+1] = '\0'; for ( defptr = defines; defptr != NULL && @@ -754,7 +754,7 @@ cppline {space}*#(.*\\{line_end})*.* /* skip the ";" and trailing whitespace. Note that yytext contains at least one non-space character plus the ";" */ - for ( i = strlen(yytext)-2; i > 0 && isspace(yytext[i]); i-- ) {} + for ( i = strlen(yytext)-2; i > 0 && isspace((int) yytext[i]); i-- ) {} yytext[i+1] = '\0'; yyin = NULL; diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 2e190fd8b1d..e1af29a1b28 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.129 2000/06/11 11:40:07 petere Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.130 2000/06/14 18:17:58 petere Exp $ * *------------------------------------------------------------------------- */ @@ -629,10 +629,7 @@ connectNoDelay(PGconn *conn) int on = 1; if (setsockopt(conn->sock, IPPROTO_TCP, TCP_NODELAY, -#ifdef WIN32 - (char *) -#endif - &on, + (char *) &on, sizeof(on)) < 0) { printfPQExpBuffer(&conn->errorMessage, @@ -1098,7 +1095,7 @@ keep_going: /* We will come back to here until there */ if (getsockopt(conn->sock, SOL_SOCKET, SO_ERROR, - &optval, &optlen) == -1) + (char *) &optval, &optlen) == -1) { printfPQExpBuffer(&conn->errorMessage, "PQconnectPoll() -- getsockopt() failed: " @@ -2117,7 +2114,7 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage) while (*cp) { /* Skip blanks before the parameter name */ - if (isspace(*cp)) + if (isspace((int) *cp)) { cp++; continue; @@ -2129,12 +2126,12 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage) { if (*cp == '=') break; - if (isspace(*cp)) + if (isspace((int) *cp)) { *cp++ = '\0'; while (*cp) { - if (!isspace(*cp)) + if (!isspace((int) *cp)) break; cp++; } @@ -2158,7 +2155,7 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage) /* Skip blanks after the '=' */ while (*cp) { - if (!isspace(*cp)) + if (!isspace((int) *cp)) break; cp++; } @@ -2171,7 +2168,7 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage) cp2 = pval; while (*cp) { - if (isspace(*cp)) + if (isspace((int) *cp)) { *cp++ = '\0'; break; diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index b90159af4dd..53fedf11bd5 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.95 2000/05/25 19:09:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.96 2000/06/14 18:17:58 petere Exp $ * *------------------------------------------------------------------------- */ @@ -1955,8 +1955,8 @@ PQfnumber(const PGresult *res, const char *field_name) } else for (i = 0; field_case[i]; i++) - if (isascii((unsigned char) field_case[i]) && - isupper(field_case[i])) + if (isascii((int) field_case[i]) && + isupper((int) field_case[i])) field_case[i] = tolower(field_case[i]); for (i = 0; i < res->numAttributes; i++) |