pg_amcheck: Use logging functions

petere · petere · commit add5fad78aac · 2021-04-23T09:55:23.000+02:00
This was already mostly done, but some error messages were printed the
long way.
diff --git a/src/bin/pg_amcheck/pg_amcheck.c b/src/bin/pg_amcheck/pg_amcheck.c
@@ -319,8 +319,7 @@ main(int argc, char *argv[])
 				opts.jobs = atoi(optarg);
 				if (opts.jobs < 1)
 				{
-					fprintf(stderr,
-							_("number of parallel jobs must be at least 1\n"));
+					pg_log_error("number of parallel jobs must be at least 1");
 					exit(1);
 				}
 				break;
@@ -393,37 +392,33 @@ main(int argc, char *argv[])
 					opts.skip = "all frozen";
 				else
 				{
-					fprintf(stderr, _("invalid skip option\n"));
+					pg_log_error("invalid skip option");
 					exit(1);
 				}
 				break;
 			case 7:
 				opts.startblock = strtol(optarg, &endptr, 10);
 				if (*endptr != '\0')
 				{
-					fprintf(stderr,
-							_("invalid start block\n"));
+					pg_log_error("invalid start block");
 					exit(1);
 				}
 				if (opts.startblock > MaxBlockNumber || opts.startblock < 0)
 				{
-					fprintf(stderr,
-							_("start block out of bounds\n"));
+					pg_log_error("start block out of bounds");
 					exit(1);
 				}
 				break;
 			case 8:
 				opts.endblock = strtol(optarg, &endptr, 10);
 				if (*endptr != '\0')
 				{
-					fprintf(stderr,
-							_("invalid end block\n"));
+					pg_log_error("invalid end block");
 					exit(1);
 				}
 				if (opts.endblock > MaxBlockNumber || opts.endblock < 0)
 				{
-					fprintf(stderr,
-							_("end block out of bounds\n"));
+					pg_log_error("end block out of bounds");
 					exit(1);
 				}
 				break;
@@ -450,8 +445,7 @@ main(int argc, char *argv[])
 
 	if (opts.endblock >= 0 && opts.endblock < opts.startblock)
 	{
-		fprintf(stderr,
-				_("end block precedes start block\n"));
+		pg_log_error("end block precedes start block");
 		exit(1);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -319,8 +319,7 @@ main(int argc, char *argv[])`
`319`	`319`	`opts.jobs = atoi(optarg);`
`320`	`320`	`if (opts.jobs < 1)`
`321`	`321`	`{`
`322`		`- fprintf(stderr,`
`323`		`- _("number of parallel jobs must be at least 1\n"));`
	`322`	`+ pg_log_error("number of parallel jobs must be at least 1");`
`324`	`323`	`exit(1);`
`325`	`324`	`}`
`326`	`325`	`break;`
`@@ -393,37 +392,33 @@ main(int argc, char *argv[])`
`393`	`392`	`opts.skip = "all frozen";`
`394`	`393`	`else`
`395`	`394`	`{`
`396`		`- fprintf(stderr, _("invalid skip option\n"));`
	`395`	`+ pg_log_error("invalid skip option");`
`397`	`396`	`exit(1);`
`398`	`397`	`}`
`399`	`398`	`break;`
`400`	`399`	`case 7:`
`401`	`400`	`opts.startblock = strtol(optarg, &endptr, 10);`
`402`	`401`	`if (*endptr != '\0')`
`403`	`402`	`{`
`404`		`- fprintf(stderr,`
`405`		`- _("invalid start block\n"));`
	`403`	`+ pg_log_error("invalid start block");`
`406`	`404`	`exit(1);`
`407`	`405`	`}`
`408`	`406`	`if (opts.startblock > MaxBlockNumber \|\| opts.startblock < 0)`
`409`	`407`	`{`
`410`		`- fprintf(stderr,`
`411`		`- _("start block out of bounds\n"));`
	`408`	`+ pg_log_error("start block out of bounds");`
`412`	`409`	`exit(1);`
`413`	`410`	`}`
`414`	`411`	`break;`
`415`	`412`	`case 8:`
`416`	`413`	`opts.endblock = strtol(optarg, &endptr, 10);`
`417`	`414`	`if (*endptr != '\0')`
`418`	`415`	`{`
`419`		`- fprintf(stderr,`
`420`		`- _("invalid end block\n"));`
	`416`	`+ pg_log_error("invalid end block");`
`421`	`417`	`exit(1);`
`422`	`418`	`}`
`423`	`419`	`if (opts.endblock > MaxBlockNumber \|\| opts.endblock < 0)`
`424`	`420`	`{`
`425`		`- fprintf(stderr,`
`426`		`- _("end block out of bounds\n"));`
	`421`	`+ pg_log_error("end block out of bounds");`
`427`	`422`	`exit(1);`
`428`	`423`	`}`
`429`	`424`	`break;`
`@@ -450,8 +445,7 @@ main(int argc, char *argv[])`
`450`	`445`
`451`	`446`	`if (opts.endblock >= 0 && opts.endblock < opts.startblock)`
`452`	`447`	`{`
`453`		`- fprintf(stderr,`
`454`		`- _("end block precedes start block\n"));`
	`448`	`+ pg_log_error("end block precedes start block");`
`455`	`449`	`exit(1);`
`456`	`450`	`}`
`457`	`451`