NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commitd923125

committed

Fix incorrect uses of gzFile

gzFile is already a pointer, so code likegzFile *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 zlibversions 1.2.3.4 and 1.2.6, the definition of gzFile was changed tostruct gzFile_s *, and with that new definition this usage causescompiler warnings.So remove all those extra pointer decorations.There is a related issue in pg_backup_archiver.h, whereFILE *FH; /* General purpose file handle */is used throughout pg_dump as sometimes a real FILE* and sometimes agzFile handle, which also causes warnings now. This is not yet fixedhere, because it might need more code restructuring.

1 parent8e5f430 commitd923125Copy full SHA for d923125

File tree

3 files changed

-10

lines changed

src/bin
- pg_basebackup
  - pg_basebackup.c
- pg_dump
  - pg_backup_files.c
  - pg_backup_tar.c

3 files changed

-10

lines changed

`‎src/bin/pg_basebackup/pg_basebackup.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ static bool segment_callback(XLogRecPtr segendpos, uint32 timeline);`
`82`	`82`
`83`	`83`	`#ifdefHAVE_LIBZ`
`84`	`84`	`staticconstchar*`
`85`		`-get_gz_error(gzFile*gzf)`
	`85`	`+get_gz_error(gzFilegzf)`
`86`	`86`	`{`
`87`	`87`	`interrnum;`
`88`	`88`	`constchar*errmsg;`
`@@ -450,7 +450,7 @@ ReceiveTarFile(PGconn conn, PGresult res, int rownum)`
`450`	`450`	`FILE*tarfile=NULL;`
`451`	`451`
`452`	`452`	`#ifdefHAVE_LIBZ`
`453`		`-gzFile*ztarfile=NULL;`
	`453`	`+gzFileztarfile=NULL;`
`454`	`454`	`#endif`
`455`	`455`
`456`	`456`	`if (PQgetisnull(res,rownum,0))`

`‎src/bin/pg_dump/pg_backup_files.c‎`

Lines changed: 1 addition & 1 deletion

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

`‎src/bin/pg_dump/pg_backup_tar.c‎`

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,16 +58,13 @@ static void _EndBlobs(ArchiveHandle AH, TocEntry te);`
`58`	`58`	`#defineK_STD_BUF_SIZE 1024`
`59`	`59`
`60`	`60`
	`61`	`+typedefstruct`
	`62`	`+{`
`61`	`63`	`#ifdefHAVE_LIBZ`
`62`		`-/* typedef gzFile ThingFile; */`
`63`		`-typedefFILEThingFile;`
	`64`	`+gzFilezFH;`
`64`	`65`	`#else`
`65`		`-typedefFILEThingFile;`
	`66`	`+FILE*zFH;`
`66`	`67`	`#endif`
`67`		`-`
`68`		`-typedefstruct`
`69`		`-{`
`70`		`-ThingFile*zFH;`
`71`	`68`	`FILE*nFH;`
`72`	`69`	`FILE*tarFH;`
`73`	`70`	`FILE*tmpFH;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd923125

File tree

3 files changed

3 files changed

`‎src/bin/pg_basebackup/pg_basebackup.c‎`

`‎src/bin/pg_dump/pg_backup_files.c‎`

`‎src/bin/pg_dump/pg_backup_tar.c‎`

0 commit comments