Add casts to suppress compiler warnings observed on Darwin platform

tglsfdc · tglsfdc · commit 64af43a15f97 · 2001-11-08T04:05:13.000Z
(surprised no one has reported these yet...)
diff --git 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
@@ -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
@@ -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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.40 2001/10/28 06:25:51 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.41 2001/11/08 04:05:13 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -349,7 +349,7 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)`
`349`	`349`
`350`	`350`	`if (totallen > (Size) (pd_special - pd_lower))`
`351`	`351`	`elog(ERROR, "PageRepairFragmentation: corrupted item lengths, total %u, avail %u",`
`352`		`- totallen, pd_special - pd_lower);`
	`352`	`+ (unsigned int) totallen, pd_special - pd_lower);`
`353`	`353`
`354`	`354`	`/* sort itemIdSortData array into decreasing itemoff order */`
`355`	`355`	`qsort((char *) itemidbase, nused, sizeof(struct itemIdSortData),`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.37 2001/11/05 17:46:30 momjian Exp $`
	`18`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.38 2001/11/08 04:05:12 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`* Modifications - 28-Jun-2000 - pjw@rhyme.com.au`
`21`	`21`	`*`
`@@ -1226,10 +1226,11 @@ ahwrite(const void ptr, size_t size, size_t nmemb, ArchiveHandle AH)`
`1226`	`1226`	`if (AH->writingBlob)`
`1227`	`1227`	`{`
`1228`	`1228`	`res = lo_write(AH->connection, AH->loFd, (void ) ptr, size nmemb);`
`1229`		`- ahlog(AH, 5, "wrote %d bytes of large object data (result = %d)\n", size * nmemb, res);`
`1230`		`- if (res < size * nmemb)`
	`1229`	`+ ahlog(AH, 5, "wrote %d bytes of large object data (result = %d)\n",`
	`1230`	`+ (int) (size * nmemb), res);`
	`1231`	`+ if (res != size * nmemb)`
`1231`	`1232`	`die_horribly(AH, modulename, "could not write to large object (result: %d, expected: %d)\n",`
`1232`		`- res, size * nmemb);`
	`1233`	`+ res, (int) (size * nmemb));`
`1233`	`1234`
`1234`	`1235`	`return res;`
`1235`	`1236`	`}`
`@@ -1260,7 +1261,8 @@ ahwrite(const void ptr, size_t size, size_t nmemb, ArchiveHandle AH)`
`1260`	`1261`	`{`
`1261`	`1262`	`res = fwrite((void *) ptr, size, nmemb, AH->OF);`
`1262`	`1263`	`if (res != nmemb)`
`1263`		`- die_horribly(AH, modulename, "could not write to output file (%d != %d)\n", res, nmemb);`
	`1264`	`+ die_horribly(AH, modulename, "could not write to output file (%d != %d)\n",`
	`1265`	`+ res, (int) nmemb);`
`1264`	`1266`	`return res;`
`1265`	`1267`	`}`
`1266`	`1268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*`
`26`	`26`	`*`
`27`	`27`	`* IDENTIFICATION`
`28`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.60 2001/11/05 17:46:37 momjian Exp $`
	`28`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.61 2001/11/08 04:05:13 tgl Exp $`
`29`	`29`	`*`
`30`	`30`	`*-------------------------------------------------------------------------`
`31`	`31`	`*/`
`@@ -128,7 +128,8 @@ pqPutBytes(const char s, size_t nbytes, PGconn conn)`
`128`	`128`	`{`
`129`	`129`	`printfPQExpBuffer(&conn->errorMessage,`
`130`	`130`	`libpq_gettext("could not flush enough data (space available: %d, space needed %d)\n"),`
`131`		`- Max(conn->outBufSize - conn->outCount, 0), nbytes);`
	`131`	`+ (int) Max(conn->outBufSize - conn->outCount, 0),`
	`132`	`+ (int) nbytes);`
`132`	`133`	`return EOF;`
`133`	`134`	`}`
`134`	`135`	`/* fixup avail for while loop */`