From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date: Thu, 19 May 2005 13:23:18 +0000 (+0200)
Subject: [PATCH] Declare stacked variables before the first statement.
X-Git-Tag: v0.99~535
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9669e17a2f79e8ef0bd5981f8178cada5e53d46b;p=git.git

[PATCH] Declare stacked variables before the first statement.

Signed-off-by: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/diff.c b/diff.c
index c5ecc43fc..92fcc677e 100644
--- a/diff.c
+++ b/diff.c
@@ -95,7 +95,7 @@ static void builtin_diff(const char *name_a,
 			 const char *name_b,
 			 struct diff_tempfile *temp)
 {
-	int i, next_at;
+	int i, next_at, cmd_size;
 	const char *diff_cmd = "diff -L'%s%s' -L'%s%s'";
 	const char *diff_arg  = "'%s' '%s'||:"; /* "||:" is to return 0 */
 	const char *input_name_sq[2];
@@ -112,7 +112,7 @@ static void builtin_diff(const char *name_a,
 	 * we use 2 spaces around diff-opts, and we need to count
 	 * terminating NUL, so we subtract 9 here.
 	 */
-	int cmd_size = (strlen(diff_cmd) + strlen(diff_opts) +
+	cmd_size = (strlen(diff_cmd) + strlen(diff_opts) +
 			strlen(diff_arg) - 9);
 	for (i = 0; i < 2; i++) {
 		input_name_sq[i] = sq_expand(temp[i].name);