Adjust error message

petere · petere · commit e5d11b91e42e · 2018-06-11T17:19:11.000-04: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
@@ -83,11 +83,11 @@ get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p)
 		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
`@@ -83,11 +83,11 @@ get_controlfile(const char DataDir, const char progname, bool *crc_ok_p)`
`83`	`83`	`else`
`84`	`84`	`#ifndef FRONTEND`
`85`	`85`	`ereport(ERROR,`
`86`		`- (errmsg("could not read file \"%s\": read %d bytes, expected %d",`
	`86`	`+ (errmsg("could not read file \"%s\": read %d of %d",`
`87`	`87`	`ControlFilePath, r, (int) sizeof(ControlFileData))));`
`88`	`88`	`#else`
`89`	`89`	`{`
`90`		`- fprintf(stderr, _("%s: could not read file \"%s\": read %d bytes, expected %d\n"),`
	`90`	`+ fprintf(stderr, _("%s: could not read file \"%s\": read %d of %d\n"),`
`91`	`91`	`progname, ControlFilePath, r, (int) sizeof(ControlFileData));`
`92`	`92`	`exit(EXIT_FAILURE);`
`93`	`93`	`}`