summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2009-03-07 20:02:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-08 04:52:23 (GMT)
commitfd13b21f52b499ff6fa951ce27d4b9c9f0653087 (patch)
treeb59de697d0f3ce229daabd83387ab01d162a1371 /combine-diff.c
parenteb3a9dd3279fe4b05f286665986ebf6d43a6ccc0 (diff)
downloadgit-fd13b21f52b499ff6fa951ce27d4b9c9f0653087.zip
git-fd13b21f52b499ff6fa951ce27d4b9c9f0653087.tar.gz
git-fd13b21f52b499ff6fa951ce27d4b9c9f0653087.tar.bz2
Move local variables to narrower scopes
These weren't used outside and can be safely moved Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c
index bccc018..b3b86ae 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -526,7 +526,6 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,
return; /* result deleted */
while (1) {
- struct sline *sl = &sline[lno];
unsigned long hunk_end;
unsigned long rlines;
const char *hunk_comment = NULL;
@@ -592,7 +591,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,
struct lline *ll;
int j;
unsigned long p_mask;
- sl = &sline[lno++];
+ struct sline *sl = &sline[lno++];
ll = (sl->flag & no_pre_delete) ? NULL : sl->lost_head;
while (ll) {
fputs(c_old, stdout);