about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2016-08-07 16:14:49 +0100
committerJohn Keeping <john@keeping.me.uk>2016-10-01 11:43:45 +0100
commit7e67c64894b1093fbc009edd811fee1e76daa2d7 (patch)
tree5bfc570a1b1041d27b3b785453cc28d45f748969
parentui-shared: fix decl-after-statement warnings (diff)
downloadcgit-pink-7e67c64894b1093fbc009edd811fee1e76daa2d7.tar.gz
cgit-pink-7e67c64894b1093fbc009edd811fee1e76daa2d7.zip
ui-ssdiff: fix decl-after-statement warnings
git.git's coding style avoids decl-after-statement and we generally try
to follow it but a few warnings have crept in recently.  Fix the one in
ui-ssdiff.c

Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r--ui-ssdiff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 16c812f..7f261ed 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -92,7 +92,7 @@ static char *longest_common_subsequence(char *A, char *B)
 static int line_from_hunk(char *line, char type)
 {
 	char *buf1, *buf2;
-	int len;
+	int len, res;
 
 	buf1 = strchr(line, type);
 	if (buf1 == NULL)
@@ -105,7 +105,7 @@ static int line_from_hunk(char *line, char type)
 	buf2 = xmalloc(len + 1);
 	strncpy(buf2, buf1, len);
 	buf2[len] = '\0';
-	int res = atoi(buf2);
+	res = atoi(buf2);
 	free(buf2);
 	return res;
 }