Adjust error message

petere · petere · commit 5ba761929caa · 2018-08-06T10:54:19.000+02:00
Makes it look more similar to other ones, and avoids the need for
pluralization.
diff --git a/src/common/controldata_utils.c b/src/common/controldata_utils.c
@@ -78,11 +78,11 @@ get_controlfile(char *DataDir, const char *progname)
 		else
 #ifndef FRONTEND
 			ereport(ERROR,
-					(errmsg("could not read file \"%s\": read %d bytes, expected %d",
+					(errmsg("could not read file \"%s\": read %d of %d",
 							ControlFilePath, r, (int) sizeof(ControlFileData))));
 #else
 		{
-			fprintf(stderr, _("%s: could not read file \"%s\": read %d bytes, expected %d\n"),
+			fprintf(stderr, _("%s: could not read file \"%s\": read %d of %d\n"),
 					progname, ControlFilePath, r, (int) sizeof(ControlFileData));
 			exit(EXIT_FAILURE);
 		}

Original file line number	Diff line number	Diff line change
`@@ -78,11 +78,11 @@ get_controlfile(char DataDir, const char progname)`
`78`	`78`	`else`
`79`	`79`	`#ifndef FRONTEND`
`80`	`80`	`ereport(ERROR,`
`81`		`- (errmsg("could not read file \"%s\": read %d bytes, expected %d",`
	`81`	`+ (errmsg("could not read file \"%s\": read %d of %d",`
`82`	`82`	`ControlFilePath, r, (int) sizeof(ControlFileData))));`
`83`	`83`	`#else`
`84`	`84`	`{`
`85`		`- fprintf(stderr, _("%s: could not read file \"%s\": read %d bytes, expected %d\n"),`
	`85`	`+ fprintf(stderr, _("%s: could not read file \"%s\": read %d of %d\n"),`
`86`	`86`	`progname, ControlFilePath, r, (int) sizeof(ControlFileData));`
`87`	`87`	`exit(EXIT_FAILURE);`
`88`	`88`	`}`