Fix compiler warning about format truncation

petere · petere · commit 2cd6520e78fe · 2018-04-06T08:43:50.000-04:00
diff --git a/src/bin/pg_verify_checksums/pg_verify_checksums.c b/src/bin/pg_verify_checksums/pg_verify_checksums.c
@@ -130,7 +130,7 @@ scan_directory(char *basedir, char *subdir)
 	DIR		   *dir;
 	struct dirent *de;
 
-	snprintf(path, MAXPGPATH, "%s/%s", basedir, subdir);
+	snprintf(path, sizeof(path), "%s/%s", basedir, subdir);
 	dir = opendir(path);
 	if (!dir)
 	{
@@ -140,13 +140,13 @@ scan_directory(char *basedir, char *subdir)
 	}
 	while ((de = readdir(dir)) != NULL)
 	{
-		char		fn[MAXPGPATH];
+		char		fn[MAXPGPATH + 1];
 		struct stat st;
 
 		if (skipfile(de->d_name))
 			continue;
 
-		snprintf(fn, MAXPGPATH, "%s/%s", path, de->d_name);
+		snprintf(fn, sizeof(fn), "%s/%s", path, de->d_name);
 		if (lstat(fn, &st) < 0)
 		{
 			fprintf(stderr, _("%s: could not stat file \"%s\": %m\n"),

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ scan_directory(char basedir, char subdir)`
`130`	`130`	`DIR *dir;`
`131`	`131`	`struct dirent *de;`
`132`	`132`
`133`		`- snprintf(path, MAXPGPATH, "%s/%s", basedir, subdir);`
	`133`	`+ snprintf(path, sizeof(path), "%s/%s", basedir, subdir);`
`134`	`134`	`dir = opendir(path);`
`135`	`135`	`if (!dir)`
`136`	`136`	`{`
`@@ -140,13 +140,13 @@ scan_directory(char basedir, char subdir)`
`140`	`140`	`}`
`141`	`141`	`while ((de = readdir(dir)) != NULL)`
`142`	`142`	`{`
`143`		`- char fn[MAXPGPATH];`
	`143`	`+ char fn[MAXPGPATH + 1];`
`144`	`144`	`struct stat st;`
`145`	`145`
`146`	`146`	`if (skipfile(de->d_name))`
`147`	`147`	`continue;`
`148`	`148`
`149`		`- snprintf(fn, MAXPGPATH, "%s/%s", path, de->d_name);`
	`149`	`+ snprintf(fn, sizeof(fn), "%s/%s", path, de->d_name);`
`150`	`150`	`if (lstat(fn, &st) < 0)`
`151`	`151`	`{`
`152`	`152`	`fprintf(stderr, _("%s: could not stat file \"%s\": %m\n"),`