Fix ReadOffset() to work correctly when off_t is wider than int.

tglsfdc · tglsfdc · commit 9a4ef0c56283 · 2004-01-04T04:02:15.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
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.81 2003/12/06 03:00:11 tgl Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.82 2004/01/04 04:02:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1291,7 +1291,7 @@ ReadOffset(ArchiveHandle *AH, off_t *o)
 	for (off = 0; off < AH->offSize; off++)
 	{
 		if (off < sizeof(off_t))
-			*o |= ((*AH->ReadBytePtr) (AH)) << (off * 8);
+			*o |= ((off_t) ((*AH->ReadBytePtr) (AH))) << (off * 8);
 		else
 		{
 			if ((*AH->ReadBytePtr) (AH) != 0)

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.81 2003/12/06 03:00:11 tgl Exp $`
	`18`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.82 2004/01/04 04:02:15 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -1291,7 +1291,7 @@ ReadOffset(ArchiveHandle AH, off_t o)`
`1291`	`1291`	`for (off = 0; off < AH->offSize; off++)`
`1292`	`1292`	`{`
`1293`	`1293`	`if (off < sizeof(off_t))`
`1294`		`- o \|= ((AH->ReadBytePtr) (AH)) << (off * 8);`
	`1294`	`+ o \|= ((off_t) ((AH->ReadBytePtr) (AH))) << (off * 8);`
`1295`	`1295`	`else`
`1296`	`1296`	`{`
`1297`	`1297`	`if ((*AH->ReadBytePtr) (AH) != 0)`