sq_quote_argv: drop maxlen parameter

peff · gitster · commit e35f11c29391 · 2018-01-16T12:16:54.000-08:00
No caller passes anything but "0" for this parameter, which requests that the function ignore it completely. In fact, in all of history there was only one such caller, and it went away in 7f51f8b (alias: use run_command api to execute aliases, 2011-01-07). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/am.c b/builtin/am.c
@@ -1061,7 +1061,7 @@ static void am_setup(struct am_state *state, enum patch_format patch_format,
 	}
 	write_state_text(state, "scissors", str);
 
-	sq_quote_argv(&sb, state->git_apply_opts.argv, 0);
+	sq_quote_argv(&sb, state->git_apply_opts.argv);
 	write_state_text(state, "apply-opt", sb.buf);
 
 	if (state->rebasing)
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
@@ -516,7 +516,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 			PARSE_OPT_SHELL_EVAL);
 
 	strbuf_addstr(&parsed, " --");
-	sq_quote_argv(&parsed, argv, 0);
+	sq_quote_argv(&parsed, argv);
 	puts(parsed.buf);
 	return 0;
 }
@@ -526,7 +526,7 @@ static int cmd_sq_quote(int argc, const char **argv)
 	struct strbuf buf = STRBUF_INIT;
 
 	if (argc)
-		sq_quote_argv(&buf, argv, 0);
+		sq_quote_argv(&buf, argv);
 	printf("%s\n", buf.buf);
 	strbuf_release(&buf);
 
diff --git a/quote.c b/quote.c
@@ -56,7 +56,7 @@ void sq_quotef(struct strbuf *dst, const char *fmt, ...)
 	strbuf_release(&src);
 }
 
-void sq_quote_argv(struct strbuf *dst, const char** argv, size_t maxlen)
+void sq_quote_argv(struct strbuf *dst, const char **argv)
 {
 	int i;
 
@@ -65,8 +65,6 @@ void sq_quote_argv(struct strbuf *dst, const char** argv, size_t maxlen)
 	for (i = 0; argv[i]; ++i) {
 		strbuf_addch(dst, ' ');
 		sq_quote_buf(dst, argv[i]);
-		if (maxlen && dst->len > maxlen)
-			die("Too many or long arguments");
 	}
 }
 
diff --git a/quote.h b/quote.h
@@ -30,7 +30,7 @@ struct strbuf;
  */
 
 extern void sq_quote_buf(struct strbuf *, const char *src);
-extern void sq_quote_argv(struct strbuf *, const char **argv, size_t maxlen);
+extern void sq_quote_argv(struct strbuf *, const char **argv);
 extern void sq_quotef(struct strbuf *, const char *fmt, ...);
 
 /* This unwraps what sq_quote() produces in place, but returns
diff --git a/trace.c b/trace.c
@@ -157,7 +157,7 @@ static void trace_argv_vprintf_fl(const char *file, int line,
 
 	strbuf_vaddf(&buf, format, ap);
 
-	sq_quote_argv(&buf, argv, 0);
+	sq_quote_argv(&buf, argv);
 	print_trace_line(&trace_default_key, &buf);
 }
 
@@ -426,6 +426,6 @@ void trace_command_performance(const char **argv)
 		atexit(print_command_performance_atexit);
 
 	strbuf_reset(&command_line);
-	sq_quote_argv(&command_line, argv, 0);
+	sq_quote_argv(&command_line, argv);
 	command_start_time = getnanotime();
 }

Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,7 @@ static void am_setup(struct am_state *state, enum patch_format patch_format,`
`1061`	`1061`	`}`
`1062`	`1062`	`write_state_text(state, "scissors", str);`
`1063`	`1063`
`1064`		`- sq_quote_argv(&sb, state->git_apply_opts.argv, 0);`
	`1064`	`+ sq_quote_argv(&sb, state->git_apply_opts.argv);`
`1065`	`1065`	`write_state_text(state, "apply-opt", sb.buf);`
`1066`	`1066`
`1067`	`1067`	`if (state->rebasing)`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ void sq_quotef(struct strbuf dst, const char fmt, ...)`
`56`	`56`	`strbuf_release(&src);`
`57`	`57`	`}`
`58`	`58`
`59`		`-void sq_quote_argv(struct strbuf dst, const char* argv, size_t maxlen)`
	`59`	`+void sq_quote_argv(struct strbuf dst, const char *argv)`
`60`	`60`	`{`
`61`	`61`	`int i;`
`62`	`62`
`@@ -65,8 +65,6 @@ void sq_quote_argv(struct strbuf dst, const char* argv, size_t maxlen)`
`65`	`65`	`for (i = 0; argv[i]; ++i) {`
`66`	`66`	`strbuf_addch(dst, ' ');`
`67`	`67`	`sq_quote_buf(dst, argv[i]);`
`68`		`- if (maxlen && dst->len > maxlen)`
`69`		`- die("Too many or long arguments");`
`70`	`68`	`}`
`71`	`69`	`}`
`72`	`70`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ static void trace_argv_vprintf_fl(const char *file, int line,`
`157`	`157`
`158`	`158`	`strbuf_vaddf(&buf, format, ap);`
`159`	`159`
`160`		`- sq_quote_argv(&buf, argv, 0);`
	`160`	`+ sq_quote_argv(&buf, argv);`
`161`	`161`	`print_trace_line(&trace_default_key, &buf);`
`162`	`162`	`}`
`163`	`163`
`@@ -426,6 +426,6 @@ void trace_command_performance(const char **argv)`
`426`	`426`	`atexit(print_command_performance_atexit);`
`427`	`427`
`428`	`428`	`strbuf_reset(&command_line);`
`429`		`- sq_quote_argv(&command_line, argv, 0);`
	`429`	`+ sq_quote_argv(&command_line, argv);`
`430`	`430`	`command_start_time = getnanotime();`
`431`	`431`	`}`