Fix incorrect uses of gzFile

petere · petere · commit d923125b77c5 · 2012-03-02T22:30:01.000+02:00
gzFile is already a pointer, so code like

gzFile *handle = gzopen(...)

is wrong.

This used to pass silently because gzFile used to be defined as void*,
and you can assign a void* to a void**.  But somewhere between zlib
versions 1.2.3.4 and 1.2.6, the definition of gzFile was changed to
struct gzFile_s *, and with that new definition this usage causes
compiler warnings.

So remove all those extra pointer decorations.

There is a related issue in pg_backup_archiver.h, where

FILE       *FH;             /* General purpose file handle */

is used throughout pg_dump as sometimes a real FILE* and sometimes a
gzFile handle, which also causes warnings now.  This is not yet fixed
here, because it might need more code restructuring.
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -82,7 +82,7 @@ static bool segment_callback(XLogRecPtr segendpos, uint32 timeline);
 
 #ifdef HAVE_LIBZ
 static const char *
-get_gz_error(gzFile *gzf)
+get_gz_error(gzFile gzf)
 {
 	int			errnum;
 	const char *errmsg;
@@ -450,7 +450,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 	FILE	   *tarfile = NULL;
 
 #ifdef HAVE_LIBZ
-	gzFile	   *ztarfile = NULL;
+	gzFile		ztarfile = NULL;
 #endif
 
 	if (PQgetisnull(res, rownum, 0))
diff --git a/src/bin/pg_dump/pg_backup_files.c b/src/bin/pg_dump/pg_backup_files.c
@@ -60,7 +60,7 @@ typedef struct
 typedef struct
 {
 #ifdef HAVE_LIBZ
-	gzFile	   *FH;
+	gzFile		FH;
 #else
 	FILE	   *FH;
 #endif
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
@@ -58,16 +58,13 @@ static void _EndBlobs(ArchiveHandle *AH, TocEntry *te);
 #define K_STD_BUF_SIZE 1024
 
 
+typedef struct
+{
 #ifdef HAVE_LIBZ
- /* typedef gzFile	 ThingFile; */
-typedef FILE ThingFile;
+	gzFile		zFH;
 #else
-typedef FILE ThingFile;
+	FILE	   *zFH;
 #endif
-
-typedef struct
-{
-	ThingFile  *zFH;
 	FILE	   *nFH;
 	FILE	   *tarFH;
 	FILE	   *tmpFH;

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ typedef struct`
`60`	`60`	`typedef struct`
`61`	`61`	`{`
`62`	`62`	`#ifdef HAVE_LIBZ`
`63`		`- gzFile *FH;`
	`63`	`+ gzFile FH;`
`64`	`64`	`#else`
`65`	`65`	`FILE *FH;`
`66`	`66`	`#endif`