l10n: tr: v2.33 (round 2)

[thirdparty/git.git] / combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 7d925ce9ce44c8de5915a706c081466400b9cbe9..d93782daeb37fee21f5898600ff15628b32d4779 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -403,11 +403,11 @@ static void consume_hunk(void *state_,
        state->sline[state->nb-1].p_lno[state->n] = state->ob;
 }
 
-static void consume_line(void *state_, char *line, unsigned long len)
+static int consume_line(void *state_, char *line, unsigned long len)
 {
        struct combine_diff_state *state = state_;
        if (!state->lost_bucket)
-               return; /* not in any hunk yet */
+               return 0; /* not in any hunk yet */
        switch (line[0]) {
        case '-':
                append_lost(state->lost_bucket, state->n, line+1, len-1);
@@ -417,6 +417,7 @@ static void consume_line(void *state_, char *line, unsigned long len)
                state->lno++;
                break;
        }
+       return 0;
 }
 
 static void combine_diff(struct repository *r,