Commit3b5d372

committed

pg_upgrade: Clean up some redundant code

No need to call exit() after pg_fatal(). Clean up a few stragglersfor consistency.

1 parent93765bd commit3b5d372Copy full SHA for 3b5d372

File tree

-11

lines changed

-11

lines changed

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -169,18 +169,12 @@ parseCommandLine(int argc, char *argv[])`
`169`	`169`	`*/`
`170`	`170`	`case'p':`
`171`	`171`	`if ((old_cluster.port=atoi(optarg)) <=0)`
`172`		`-{`
`173`	`172`	`pg_fatal("invalid old port number\n");`
`174`		`-exit(1);`
`175`		`-}`
`176`	`173`	`break;`
`177`	`174`
`178`	`175`	`case'P':`
`179`	`176`	`if ((new_cluster.port=atoi(optarg)) <=0)`
`180`		`-{`
`181`	`177`	`pg_fatal("invalid new port number\n");`
`182`		`-exit(1);`
`183`		`-}`
`184`	`178`	`break;`
`185`	`179`
`186`	`180`	`case'r':`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,11 +105,8 @@ main(int argc, char **argv)`
`105`	`105`
`106`	`106`	`/* Set mask based on PGDATA permissions */`
`107`	`107`	`if (!GetDataDirectoryCreatePerm(new_cluster.pgdata))`
`108`		`-{`
`109`		`-pg_log(PG_FATAL,"could not read permissions of directory \"%s\": %s\n",`
`110`		`-new_cluster.pgdata,strerror(errno));`
`111`		`-exit(1);`
`112`		`-}`
	`108`	`+pg_fatal("could not read permissions of directory \"%s\": %s\n",`
	`109`	`+new_cluster.pgdata,strerror(errno));`
`113`	`110`
`114`	`111`	`umask(pg_mode_mask);`
`115`	`112`

Comments

(0)