NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit3f1fd41

committed

Fix another incorrect data type choice from commitdc21234.

add_file_to_manifest declared its mtime argument as pg_time_t,apparently on the principle that copy-and-paste from the backendis fine. However, the callers are passing struct stat's st_mtimefield which is plain time_t, and add_file_to_manifest itself ispassing the value to gmtime(3) which expects plain time_t,so the whole thing would not work at all on any platform wherethose types are different. Fortunately we can just switch thisvariable to time_t.Per warnings from assorted buildfarm members.

1 parent390408e commit3f1fd41Copy full SHA for 3f1fd41

File tree

2 files changed

-3

lines changed

src/bin/pg_combinebackup
- write_manifest.c
- write_manifest.h

2 files changed

-3

lines changed

`‎src/bin/pg_combinebackup/write_manifest.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ create_manifest_writer(char *directory)`
`72`	`72`	`*/`
`73`	`73`	`void`
`74`	`74`	`add_file_to_manifest(manifest_writermwriter,constcharmanifest_path,`
`75`		`-size_tsize,pg_time_tmtime,`
	`75`	`+size_tsize,time_tmtime,`
`76`	`76`	`pg_checksum_typechecksum_type,`
`77`	`77`	`intchecksum_length,`
`78`	`78`	`uint8*checksum_payload)`

`‎src/bin/pg_combinebackup/write_manifest.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`#defineWRITE_MANIFEST_H`
`14`	`14`
`15`	`15`	`#include"common/checksum_helper.h"`
`16`		`-#include"pgtime.h"`
`17`	`16`
`18`	`17`	`structmanifest_wal_range;`
`19`	`18`
`@@ -23,7 +22,7 @@ typedef struct manifest_writer manifest_writer;`
`23`	`22`	`externmanifest_writercreate_manifest_writer(chardirectory);`
`24`	`23`	`externvoidadd_file_to_manifest(manifest_writer*mwriter,`
`25`	`24`	`constchar*manifest_path,`
`26`		`-size_tsize,pg_time_tmtime,`
	`25`	`+size_tsize,time_tmtime,`
`27`	`26`	`pg_checksum_typechecksum_type,`
`28`	`27`	`intchecksum_length,`
`29`	`28`	`uint8*checksum_payload);`

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!

Commit3f1fd41

File tree

2 files changed

2 files changed

`‎src/bin/pg_combinebackup/write_manifest.c`

`‎src/bin/pg_combinebackup/write_manifest.h`

0 commit comments