Remove compile warnings for lo dump by casting to char *.

bmomjian · bmomjian · commit 8be68479dc4d · 2002-04-24T14:03:22.000Z
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.43 2002/04/24 02:21:04 momjian Exp $
+ *		$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.44 2002/04/24 14:03:22 momjian Exp $
  *
  * Modifications - 28-Jun-2000 - pjw@rhyme.com.au
  *
@@ -1249,18 +1249,18 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
 		  int remaining = AH->lo_buf_size - AH->lo_buf_used;
 		  int slack = nmemb * size - remaining;
 
-		  memcpy(AH->lo_buf + AH->lo_buf_used, ptr, remaining);
+		  memcpy((char *)AH->lo_buf + AH->lo_buf_used, ptr, remaining);
 		  res = lo_write(AH->connection, AH->loFd, AH->lo_buf, AH->lo_buf_size);
 		  ahlog(AH, 5, "wrote %d bytes of large object data (result = %d)\n",
 		  	        AH->lo_buf_size, res);
 		  if (res != AH->lo_buf_size)
 			die_horribly(AH, modulename, "could not write to large object (result: %d, expected: %d)\n",
 						 res, AH->lo_buf_size);
-	          memcpy(AH->lo_buf, ptr + remaining, slack);
+	          memcpy(AH->lo_buf, (char *)ptr + remaining, slack);
 		  AH->lo_buf_used = slack;
 	       } else {
 	         /* LO Buffer is still large enough, buffer it */
-		 memcpy(AH->lo_buf + AH->lo_buf_used, ptr, size * nmemb);
+		 memcpy((char *)AH->lo_buf + AH->lo_buf_used, ptr, size * nmemb);
 		 AH->lo_buf_used += size * nmemb;
 	       }
 

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.43 2002/04/24 02:21:04 momjian Exp $`
	`18`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.44 2002/04/24 14:03:22 momjian Exp $`
`19`	`19`	`*`
`20`	`20`	`* Modifications - 28-Jun-2000 - pjw@rhyme.com.au`
`21`	`21`	`*`
`@@ -1249,18 +1249,18 @@ ahwrite(const void ptr, size_t size, size_t nmemb, ArchiveHandle AH)`
`1249`	`1249`	`int remaining = AH->lo_buf_size - AH->lo_buf_used;`
`1250`	`1250`	`int slack = nmemb * size - remaining;`
`1251`	`1251`
`1252`		`- memcpy(AH->lo_buf + AH->lo_buf_used, ptr, remaining);`
	`1252`	`+ memcpy((char *)AH->lo_buf + AH->lo_buf_used, ptr, remaining);`
`1253`	`1253`	`res = lo_write(AH->connection, AH->loFd, AH->lo_buf, AH->lo_buf_size);`
`1254`	`1254`	`ahlog(AH, 5, "wrote %d bytes of large object data (result = %d)\n",`
`1255`	`1255`	`AH->lo_buf_size, res);`
`1256`	`1256`	`if (res != AH->lo_buf_size)`
`1257`	`1257`	`die_horribly(AH, modulename, "could not write to large object (result: %d, expected: %d)\n",`
`1258`	`1258`	`res, AH->lo_buf_size);`
`1259`		`- memcpy(AH->lo_buf, ptr + remaining, slack);`
	`1259`	`+ memcpy(AH->lo_buf, (char *)ptr + remaining, slack);`
`1260`	`1260`	`AH->lo_buf_used = slack;`
`1261`	`1261`	`} else {`
`1262`	`1262`	`/* LO Buffer is still large enough, buffer it */`
`1263`		`- memcpy(AH->lo_buf + AH->lo_buf_used, ptr, size * nmemb);`
	`1263`	`+ memcpy((char )AH->lo_buf + AH->lo_buf_used, ptr, size nmemb);`
`1264`	`1264`	`AH->lo_buf_used += size * nmemb;`
`1265`	`1265`	`}`
`1266`	`1266`