Fix non-literal format in printf-style calls

Daniel Lowe · gitster · commit 9db56f71b911 · 2008-11-11T14:43:59.000-08:00
These were found using gcc 4.3.2-1ubuntu11 with the warning:

    warning: format not a string literal and no format arguments

Incorporated suggestions from Brandon Casey &lt;casey@nrlssc.navy.mil&gt;.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-remote.c b/builtin-remote.c
@@ -323,7 +323,7 @@ static int add_branch_for_removal(const char *refname,
 
 	/* make sure that symrefs are deleted */
 	if (flags & REF_ISSYMREF)
-		return unlink(git_path(refname));
+		return unlink(git_path("%s", refname));
 
 	item = string_list_append(refname, branches->branches);
 	item->util = xmalloc(20);
diff --git a/bundle.c b/bundle.c
@@ -114,7 +114,7 @@ int verify_bundle(struct bundle_header *header, int verbose)
 			continue;
 		}
 		if (++ret == 1)
-			error(message);
+			error("%s", message);
 		error("%s %s", sha1_to_hex(e->sha1), e->name);
 	}
 	if (revs.pending.nr != p->nr)
@@ -139,7 +139,7 @@ int verify_bundle(struct bundle_header *header, int verbose)
 	for (i = 0; i < req_nr; i++)
 		if (!(refs.objects[i].item->flags & SHOWN)) {
 			if (++ret == 1)
-				error(message);
+				error("%s", message);
 			error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),
 				refs.objects[i].name);
 		}
diff --git a/environment.c b/environment.c
@@ -113,7 +113,7 @@ const char *get_git_work_tree(void)
 			work_tree = git_work_tree_cfg;
 			/* make_absolute_path also normalizes the path */
 			if (work_tree && !is_absolute_path(work_tree))
-				work_tree = xstrdup(make_absolute_path(git_path(work_tree)));
+				work_tree = xstrdup(make_absolute_path(git_path("%s", work_tree)));
 		} else if (work_tree)
 			work_tree = xstrdup(make_absolute_path(work_tree));
 		git_work_tree_initialized = 1;
diff --git a/fsck.c b/fsck.c
@@ -327,7 +327,7 @@ int fsck_error_function(struct object *obj, int type, const char *fmt, ...)
 			die("this should not happen, your snprintf is broken");
 	}
 
-	error(sb.buf);
+	error("%s", sb.buf);
 	strbuf_release(&sb);
 	return 1;
 }
diff --git a/grep.c b/grep.c
@@ -507,7 +507,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
 				if (from <= last_shown)
 					from = last_shown + 1;
 				if (last_shown && from != last_shown + 1)
-					printf(hunk_mark);
+					fputs(hunk_mark, stdout);
 				while (from < lno) {
 					pcl = &prev[lno-from-1];
 					show_line(opt, pcl->bol, pcl->eol,
@@ -517,7 +517,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
 				last_shown = lno-1;
 			}
 			if (last_shown && lno != last_shown + 1)
-				printf(hunk_mark);
+				fputs(hunk_mark, stdout);
 			if (!opt->count)
 				show_line(opt, bol, eol, name, lno, ':');
 			last_shown = last_hit = lno;
@@ -528,7 +528,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
 			 * we need to show this line.
 			 */
 			if (last_shown && lno != last_shown + 1)
-				printf(hunk_mark);
+				fputs(hunk_mark, stdout);
 			show_line(opt, bol, eol, name, lno, '-');
 			last_shown = lno;
 		}
diff --git a/path.c b/path.c
@@ -41,7 +41,7 @@ char *mksnpath(char *buf, size_t n, const char *fmt, ...)
 	len = vsnprintf(buf, n, fmt, args);
 	va_end(args);
 	if (len >= n) {
-		snprintf(buf, n, bad_path);
+		strlcpy(buf, bad_path, n);
 		return buf;
 	}
 	return cleanup_path(buf);
@@ -63,7 +63,7 @@ static char *git_vsnpath(char *buf, size_t n, const char *fmt, va_list args)
 		goto bad;
 	return cleanup_path(buf);
 bad:
-	snprintf(buf, n, bad_path);
+	strlcpy(buf, bad_path, n);
 	return buf;
 }
 
diff --git a/refs.c b/refs.c
@@ -934,7 +934,7 @@ int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
 			lock->lk->filename[i] = 0;
 			path = lock->lk->filename;
 		} else {
-			path = git_path(refname);
+			path = git_path("%s", refname);
 		}
 		err = unlink(path);
 		if (err && errno != ENOENT) {
diff --git a/unpack-trees.c b/unpack-trees.c
@@ -352,7 +352,7 @@ static int unpack_failed(struct unpack_trees_options *o, const char *message)
 	discard_index(&o->result);
 	if (!o->gently) {
 		if (message)
-			return error(message);
+			return error("%s", message);
 		return -1;
 	}
 	return -1;

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ int verify_bundle(struct bundle_header *header, int verbose)`
`114`	`114`	`continue;`
`115`	`115`	`}`
`116`	`116`	`if (++ret == 1)`
`117`		`- error(message);`
	`117`	`+ error("%s", message);`
`118`	`118`	`error("%s %s", sha1_to_hex(e->sha1), e->name);`
`119`	`119`	`}`
`120`	`120`	`if (revs.pending.nr != p->nr)`
`@@ -139,7 +139,7 @@ int verify_bundle(struct bundle_header *header, int verbose)`
`139`	`139`	`for (i = 0; i < req_nr; i++)`
`140`	`140`	`if (!(refs.objects[i].item->flags & SHOWN)) {`
`141`	`141`	`if (++ret == 1)`
`142`		`- error(message);`
	`142`	`+ error("%s", message);`
`143`	`143`	`error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),`
`144`	`144`	`refs.objects[i].name);`
`145`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ int fsck_error_function(struct object obj, int type, const char fmt, ...)`
`327`	`327`	`die("this should not happen, your snprintf is broken");`
`328`	`328`	`}`
`329`	`329`
`330`		`- error(sb.buf);`
	`330`	`+ error("%s", sb.buf);`
`331`	`331`	`strbuf_release(&sb);`
`332`	`332`	`return 1;`
`333`	`333`	`}`
Original file line number	Diff line number	Diff line change
`@@ -934,7 +934,7 @@ int delete_ref(const char refname, const unsigned char sha1, int delopt)`
`934`	`934`	`lock->lk->filename[i] = 0;`
`935`	`935`	`path = lock->lk->filename;`
`936`	`936`	`} else {`
`937`		`- path = git_path(refname);`
	`937`	`+ path = git_path("%s", refname);`
`938`	`938`	`}`
`939`	`939`	`err = unlink(path);`
`940`	`940`	`if (err && errno != ENOENT) {`
Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ static int unpack_failed(struct unpack_trees_options o, const char message)`
`352`	`352`	`discard_index(&o->result);`
`353`	`353`	`if (!o->gently) {`
`354`	`354`	`if (message)`
`355`		`- return error(message);`
	`355`	`+ return error("%s", message);`
`356`	`356`	`return -1;`
`357`	`357`	`}`
`358`	`358`	`return -1;`