Commit846681f

committed

Fix some unportable constructs in parallel pg_dump code.

Didn't compile on semi-obsolete gcc, and probably not on not-gcc-at-alleither.

1 parent9e257a1 commit846681fCopy full SHA for 846681f

File tree

-11

lines changed

-11

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ typedef void (on_exit_nicely_callback) (int code, void arg);`
`44`	`44`
`45`	`45`	`externintquote_all_identifiers;`
`46`	`46`	`externconstchar*progname;`
	`47`	`+externvoid (on_exit_msg_func) (constcharmodulename,constchar*fmt,va_listap);`
`47`	`48`
`48`	`49`	`externvoidinit_parallel_dump_utils(void);`
`49`	`50`	`externconstcharfmtId(constcharidentifier);`
`@@ -87,8 +88,6 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 0)));`
`87`	`88`	`externvoid`
`88`	`89`	`exit_horribly(constcharmodulename,constcharfmt,...)`
`89`	`90`	`__attribute__((format(PG_PRINTF_ATTRIBUTE,2,3),noreturn));`
`90`		`-externvoid (on_exit_msg_func) (constcharmodulename,constchar*fmt,va_listap)`
`91`		`-__attribute__((format(PG_PRINTF_ATTRIBUTE,2,0)));`
`92`	`91`	`externvoidon_exit_nicely(on_exit_nicely_callbackfunction,void*arg);`
`93`	`92`	`externvoidexit_nicely(intcode) __attribute__((noreturn));`
`94`	`93`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,6 @@ typedef enum`
`29`	`29`	`WRKR_FINISHED`
`30`	`30`	`}T_WorkerStatus;`
`31`	`31`
`32`		`-typedefenumT_Action`
`33`		`-{`
`34`		`-ACT_DUMP,`
`35`		`-ACT_RESTORE,`
`36`		`-}T_Action;`
`37`		`-`
`38`	`32`	`/* Arguments needed for a worker process */`
`39`	`33`	`typedefstructParallelArgs`
`40`	`34`	`{`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,12 @@ struct _tocEntry;`
`114`	`114`	`struct_restoreList;`
`115`	`115`	`structParallelArgs;`
`116`	`116`	`structParallelState;`
`117`		`-enumT_Action;`
	`117`	`+`
	`118`	`+typedefenumT_Action`
	`119`	`+{`
	`120`	`+ACT_DUMP,`
	`121`	`+ACT_RESTORE`
	`122`	`+}T_Action;`
`118`	`123`
`119`	`124`	`typedefvoid (ClosePtr) (struct_archiveHandleAH);`
`120`	`125`	`typedefvoid (ReopenPtr) (struct_archiveHandleAH);`
`@@ -145,9 +150,9 @@ typedef void (DeClonePtr) (struct _archiveHandle AH);`
`145`	`150`	`typedefchar(WorkerJobRestorePtr) (struct_archiveHandleAH,struct_tocEntryte);`
`146`	`151`	`typedefchar(WorkerJobDumpPtr) (struct_archiveHandleAH,struct_tocEntryte);`
`147`	`152`	`typedefchar(MasterStartParallelItemPtr) (struct_archiveHandleAH,struct_tocEntryte,`
`148`		`-enumT_Actionact);`
	`153`	`+T_Actionact);`
`149`	`154`	`typedefint (MasterEndParallelItemPtr) (struct_archiveHandleAH,struct_tocEntry*te,`
`150`		`-constchar*str,enumT_Actionact);`
	`155`	`+constchar*str,T_Actionact);`
`151`	`156`
`152`	`157`	`typedefsize_t (CustomOutPtr) (struct_archiveHandleAH,constvoid*buf,size_tlen);`
`153`	`158`

Comments

(0)