Commit 64af43a1 authored by Tom Lane's avatar Tom Lane

Add casts to suppress compiler warnings observed on Darwin platform

(surprised no one has reported these yet...)
parent c6e25ed1
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.40 2001/10/28 06:25:51 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.41 2001/11/08 04:05:13 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -349,7 +349,7 @@ PageRepairFragmentation(Page page, OffsetNumber *unused) ...@@ -349,7 +349,7 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)
if (totallen > (Size) (pd_special - pd_lower)) if (totallen > (Size) (pd_special - pd_lower))
elog(ERROR, "PageRepairFragmentation: corrupted item lengths, total %u, avail %u", elog(ERROR, "PageRepairFragmentation: corrupted item lengths, total %u, avail %u",
totallen, pd_special - pd_lower); (unsigned int) totallen, pd_special - pd_lower);
/* sort itemIdSortData array into decreasing itemoff order */ /* sort itemIdSortData array into decreasing itemoff order */
qsort((char *) itemidbase, nused, sizeof(struct itemIdSortData), qsort((char *) itemidbase, nused, sizeof(struct itemIdSortData),
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.85 2001/10/25 05:49:46 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.86 2001/11/08 04:05:13 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -117,7 +117,8 @@ bpcharin(PG_FUNCTION_ARGS) ...@@ -117,7 +117,8 @@ bpcharin(PG_FUNCTION_ARGS)
if (strspn(s + mbmaxlen, " ") == len - mbmaxlen) if (strspn(s + mbmaxlen, " ") == len - mbmaxlen)
len = mbmaxlen; len = mbmaxlen;
else else
elog(ERROR, "value too long for type character(%d)", maxlen); elog(ERROR, "value too long for type character(%d)",
(int) maxlen);
/* /*
* XXX: at this point, maxlen is the necessary byte length, not * XXX: at this point, maxlen is the necessary byte length, not
...@@ -128,7 +129,8 @@ bpcharin(PG_FUNCTION_ARGS) ...@@ -128,7 +129,8 @@ bpcharin(PG_FUNCTION_ARGS)
if (strspn(s + maxlen, " ") == len - maxlen) if (strspn(s + maxlen, " ") == len - maxlen)
len = maxlen; len = maxlen;
else else
elog(ERROR, "value too long for type character(%d)", maxlen); elog(ERROR, "value too long for type character(%d)",
(int) maxlen);
#endif #endif
} }
#ifdef MULTIBYTE #ifdef MULTIBYTE
...@@ -443,7 +445,8 @@ varcharin(PG_FUNCTION_ARGS) ...@@ -443,7 +445,8 @@ varcharin(PG_FUNCTION_ARGS)
len = maxlen; len = maxlen;
#endif #endif
else else
elog(ERROR, "value too long for type character varying(%d)", maxlen); elog(ERROR, "value too long for type character varying(%d)",
(int) maxlen);
} }
result = palloc(len + VARHDRSZ); result = palloc(len + VARHDRSZ);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.37 2001/11/05 17:46:30 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.38 2001/11/08 04:05:12 tgl Exp $
* *
* Modifications - 28-Jun-2000 - pjw@rhyme.com.au * Modifications - 28-Jun-2000 - pjw@rhyme.com.au
* *
...@@ -1226,10 +1226,11 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH) ...@@ -1226,10 +1226,11 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
if (AH->writingBlob) if (AH->writingBlob)
{ {
res = lo_write(AH->connection, AH->loFd, (void *) ptr, size * nmemb); res = lo_write(AH->connection, AH->loFd, (void *) ptr, size * nmemb);
ahlog(AH, 5, "wrote %d bytes of large object data (result = %d)\n", size * nmemb, res); ahlog(AH, 5, "wrote %d bytes of large object data (result = %d)\n",
if (res < size * nmemb) (int) (size * nmemb), res);
if (res != size * nmemb)
die_horribly(AH, modulename, "could not write to large object (result: %d, expected: %d)\n", die_horribly(AH, modulename, "could not write to large object (result: %d, expected: %d)\n",
res, size * nmemb); res, (int) (size * nmemb));
return res; return res;
} }
...@@ -1260,7 +1261,8 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH) ...@@ -1260,7 +1261,8 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
{ {
res = fwrite((void *) ptr, size, nmemb, AH->OF); res = fwrite((void *) ptr, size, nmemb, AH->OF);
if (res != nmemb) if (res != nmemb)
die_horribly(AH, modulename, "could not write to output file (%d != %d)\n", res, nmemb); die_horribly(AH, modulename, "could not write to output file (%d != %d)\n",
res, (int) nmemb);
return res; return res;
} }
} }
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.60 2001/11/05 17:46:37 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.61 2001/11/08 04:05:13 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -128,7 +128,8 @@ pqPutBytes(const char *s, size_t nbytes, PGconn *conn) ...@@ -128,7 +128,8 @@ pqPutBytes(const char *s, size_t nbytes, PGconn *conn)
{ {
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("could not flush enough data (space available: %d, space needed %d)\n"), libpq_gettext("could not flush enough data (space available: %d, space needed %d)\n"),
Max(conn->outBufSize - conn->outCount, 0), nbytes); (int) Max(conn->outBufSize - conn->outCount, 0),
(int) nbytes);
return EOF; return EOF;
} }
/* fixup avail for while loop */ /* fixup avail for while loop */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment