Add casts to suppress compiler warnings observed on Darwin platform

(surprised no one has reported these yet...)

diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index ada46e6..916071a 100644 (file)
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -8,7 +8,7 @@
  *
  *
  * 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)
 
                if (totallen > (Size) (pd_special - pd_lower))
                        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 */
                qsort((char *) itemidbase, nused, sizeof(struct itemIdSortData),

diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index a09bed9..b7230b5 100644 (file)
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -8,7 +8,7 @@
  *
  *
  * 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)
                if (strspn(s + mbmaxlen, " ") == len - mbmaxlen)
                        len = mbmaxlen;
                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
@@ -128,7 +129,8 @@ bpcharin(PG_FUNCTION_ARGS)
                if (strspn(s + maxlen, " ") == len - maxlen)
                        len = maxlen;
                else
-                       elog(ERROR, "value too long for type character(%d)", maxlen);
+                       elog(ERROR, "value too long for type character(%d)",
+                                (int) maxlen);
 #endif
        }
 #ifdef MULTIBYTE
@@ -443,7 +445,8 @@ varcharin(PG_FUNCTION_ARGS)
                        len = maxlen;
 #endif
                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);

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 939556a..4c99d51 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * 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
  *
@@ -1226,10 +1226,11 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
        if (AH->writingBlob)
        {
                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);
-               if (res < size * nmemb)
+               ahlog(AH, 5, "wrote %d bytes of large object data (result = %d)\n",
+                         (int) (size * nmemb), res);
+               if (res != size * nmemb)
                        die_horribly(AH, modulename, "could not write to large object (result: %d, expected: %d)\n",
-                                                res, size * nmemb);
+                                                res, (int) (size * nmemb));
 
                return res;
        }
@@ -1260,7 +1261,8 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
                {
                        res = fwrite((void *) ptr, size, nmemb, AH->OF);
                        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;
                }
        }

diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 66c142c..30d1dbc 100644 (file)
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -25,7 +25,7 @@
  *
  *
  * 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)
                {
                        printfPQExpBuffer(&conn->errorMessage,
                                                          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;
                }
                /* fixup avail for while loop */