diff options
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpq/fe-exec.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-misc.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-fe.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 288cfe56cc9..0835b263bde 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.174 2005/08/23 21:02:03 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.175 2005/09/24 17:53:28 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2429,7 +2429,7 @@ PQescapeBytea(const unsigned char *bintext, size_t binlen, size_t *bytealen) { if (*vp < 0x20 || *vp > 0x7e) { - (void) sprintf(rp, "\\\\%03o", *vp); + (void) sprintf((char *) rp, "\\\\%03o", *vp); rp += 5; } else if (*vp == '\'') @@ -2483,7 +2483,7 @@ PQunescapeBytea(const unsigned char *strtext, size_t *retbuflen) if (strtext == NULL) return NULL; - strtextlen = strlen(strtext); + strtextlen = strlen((const char *) strtext); /* * Length of input is max length of output, but add one to avoid diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index b31c3a9613d..6028c865487 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.119 2005/08/23 21:02:03 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.120 2005/09/24 17:53:28 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1092,7 +1092,7 @@ pqSocketPoll(int sock, int forRead, int forWrite, time_t end_time) * specified encoding. */ int -PQmblen(const unsigned char *s, int encoding) +PQmblen(const char *s, int encoding) { return (pg_encoding_mblen(encoding, s)); } @@ -1102,7 +1102,7 @@ PQmblen(const unsigned char *s, int encoding) * specified encoding. */ int -PQdsplen(const unsigned char *s, int encoding) +PQdsplen(const char *s, int encoding) { return (pg_encoding_dsplen(encoding, s)); } diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 56fba44f8bb..f68bc0d658f 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.118 2005/06/13 02:26:53 tgl Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.119 2005/09/24 17:53:28 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -489,10 +489,10 @@ extern int lo_export(PGconn *conn, Oid lobjId, const char *filename); /* === in fe-misc.c === */ /* Determine length of multibyte encoded char at *s */ -extern int PQmblen(const unsigned char *s, int encoding); +extern int PQmblen(const char *s, int encoding); /* Determine display length of multibyte encoded char at *s */ -extern int PQdsplen(const unsigned char *s, int encoding); +extern int PQdsplen(const char *s, int encoding); /* Get encoding id from environment variable PGCLIENTENCODING */ extern int PQenv2encoding(void); |