NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita13b47a

committed

Fix unportable usage of printf("%m").

While glibc's version of printf accepts %m, most others do not;to be portable, we have to do it the hard way with strerror(errno).pg_verify_checksums evidently did not get that memo.Noted while fooling around with NetBSD-current, which generatesa compiler warning for this mistake.

1 parentc6e8464 commita13b47aCopy full SHA for a13b47a

File tree

1 file changed

-5

lines changed

src/bin/pg_verify_checksums
- pg_verify_checksums.c

1 file changed

-5

lines changed

`‎src/bin/pg_verify_checksums/pg_verify_checksums.c`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@ scan_file(char *fn, int segmentno)`
`85`	`85`	`f=open(fn,0);`
`86`	`86`	`if (f<0)`
`87`	`87`	`{`
`88`		`-fprintf(stderr,_("%s: could not open file \"%s\": %m\n"),progname,fn);`
	`88`	`+fprintf(stderr,_("%s: could not open file \"%s\": %s\n"),`
	`89`	`+progname,fn,strerror(errno));`
`89`	`90`	`exit(1);`
`90`	`91`	`}`
`91`	`92`
`@@ -137,8 +138,8 @@ scan_directory(char basedir, char subdir)`
`137`	`138`	`dir=opendir(path);`
`138`	`139`	`if (!dir)`
`139`	`140`	`{`
`140`		`-fprintf(stderr,_("%s: could not open directory \"%s\": %m\n"),`
`141`		`-progname,path);`
	`141`	`+fprintf(stderr,_("%s: could not open directory \"%s\": %s\n"),`
	`142`	`+progname,path,strerror(errno));`
`142`	`143`	`exit(1);`
`143`	`144`	`}`
`144`	`145`	`while ((de=readdir(dir))!=NULL)`
`@@ -152,8 +153,8 @@ scan_directory(char basedir, char subdir)`
`152`	`153`	`snprintf(fn,sizeof(fn),"%s/%s",path,de->d_name);`
`153`	`154`	`if (lstat(fn,&st)<0)`
`154`	`155`	`{`
`155`		`-fprintf(stderr,_("%s: could not stat file \"%s\": %m\n"),`
`156`		`-progname,fn);`
	`156`	`+fprintf(stderr,_("%s: could not stat file \"%s\": %s\n"),`
	`157`	`+progname,fn,strerror(errno));`
`157`	`158`	`exit(1);`
`158`	`159`	`}`
`159`	`160`	`if (S_ISREG(st.st_mode))`

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!

Commita13b47a

File tree

1 file changed

1 file changed

`‎src/bin/pg_verify_checksums/pg_verify_checksums.c`

0 commit comments