xdiff-interface: prepare for allowing early return

Change the function prototype of xdiff_emit_line_fn to return an "int"
instead of "void". Change all of those functions to "return 0",
nothing checks those return values yet, and no behavior is being
changed.

In subsequent commits the interface will be changed to allow early
return via this new return value.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/combine-diff.c b/combine-diff.c
index 06635f91bc21a54a5e7bfa4355c2d8e4b536f257..a12d3bc0d9c820f442a079d99ca781a8159f641a 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,

diff --git a/diff.c b/diff.c
index c1f47a7f0136dc74af4c812b3ea929bfa9271a10..7a03c581c7938fd9fe2794af0775ae24707d8f58 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2336,7 +2336,7 @@ static void find_lno(const char *line, struct emit_callback *ecbdata)
        ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
 }
 
-static void fn_out_consume(void *priv, char *line, unsigned long len)
+static int fn_out_consume(void *priv, char *line, unsigned long len)
 {
        struct emit_callback *ecbdata = priv;
        struct diff_options *o = ecbdata->opt;
@@ -2372,7 +2372,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
                len = sane_truncate_line(line, len);
                find_lno(line, ecbdata);
                emit_hunk_header(ecbdata, line, len);
-               return;
+               return 0;
        }
 
        if (ecbdata->diff_words) {
@@ -2382,11 +2382,11 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
                if (line[0] == '-') {
                        diff_words_append(line, len,
                                          &ecbdata->diff_words->minus);
-                       return;
+                       return 0;
                } else if (line[0] == '+') {
                        diff_words_append(line, len,
                                          &ecbdata->diff_words->plus);
-                       return;
+                       return 0;
                } else if (starts_with(line, "\\ ")) {
                        /*
                         * Eat the "no newline at eof" marker as if we
@@ -2395,11 +2395,11 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
                         * defer processing. If this is the end of
                         * preimage, more "+" lines may come after it.
                         */
-                       return;
+                       return 0;
                }
                diff_words_flush(ecbdata);
                emit_diff_symbol(o, s, line, len, 0);
-               return;
+               return 0;
        }
 
        switch (line[0]) {
@@ -2423,6 +2423,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
                                 line, len, 0);
                break;
        }
+       return 0;
 }
 
 static void pprint_rename(struct strbuf *name, const char *a, const char *b)
@@ -2522,7 +2523,7 @@ static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
        return x;
 }
 
-static void diffstat_consume(void *priv, char *line, unsigned long len)
+static int diffstat_consume(void *priv, char *line, unsigned long len)
 {
        struct diffstat_t *diffstat = priv;
        struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
@@ -2531,6 +2532,7 @@ static void diffstat_consume(void *priv, char *line, unsigned long len)
                x->added++;
        else if (line[0] == '-')
                x->deleted++;
+       return 0;
 }
 
 const char mime_boundary_leader[] = "------------";
@@ -3208,7 +3210,7 @@ static void checkdiff_consume_hunk(void *priv,
        data->lineno = nb - 1;
 }
 
-static void checkdiff_consume(void *priv, char *line, unsigned long len)
+static int checkdiff_consume(void *priv, char *line, unsigned long len)
 {
        struct checkdiff_t *data = priv;
        int marker_size = data->conflict_marker_size;
@@ -3232,7 +3234,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
                }
                bad = ws_check(line + 1, len - 1, data->ws_rule);
                if (!bad)
-                       return;
+                       return 0;
                data->status |= bad;
                err = whitespace_error_string(bad);
                fprintf(data->o->file, "%s%s:%d: %s.\n",
@@ -3244,6 +3246,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
        } else if (line[0] == ' ') {
                data->lineno++;
        }
+       return 0;
 }
 
 static unsigned char *deflate_it(char *data,
@@ -6121,17 +6124,18 @@ void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx)
        }
 }
 
-static void patch_id_consume(void *priv, char *line, unsigned long len)
+static int patch_id_consume(void *priv, char *line, unsigned long len)
 {
        struct patch_id_t *data = priv;
        int new_len;
 
        if (len > 12 && starts_with(line, "\\ "))
-               return;
+               return 0;
        new_len = remove_space(line, len);
 
        the_hash_algo->update_fn(data->ctx, line, new_len);
        data->patchlen += new_len;
+       return 0;
 }
 
 static void patch_id_add_string(git_hash_ctx *ctx, const char *str)

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index b7494fdf89c22b317fff7e1f8aeacd7273e67ac5..27aa20be350952a6313bc61bf146e905d123f9d9 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -19,21 +19,22 @@ struct diffgrep_cb {
        int hit;
 };
 
-static void diffgrep_consume(void *priv, char *line, unsigned long len)
+static int diffgrep_consume(void *priv, char *line, unsigned long len)
 {
        struct diffgrep_cb *data = priv;
        regmatch_t regmatch;
 
        if (line[0] != '+' && line[0] != '-')
-               return;
+               return 0;
        if (data->hit)
                /*
                 * NEEDSWORK: we should have a way to terminate the
                 * caller early.
                 */
-               return;
+               return 0;
        data->hit = !regexec_buf(data->regexp, line + 1, len - 1, 1,
                                 &regmatch, 0);
+       return 0;
 }
 
 static int diff_grep(mmfile_t *one, mmfile_t *two,

diff --git a/range-diff.c b/range-diff.c
index 116fb0735c6f4908b126d8471c9a8a52be9ccc21..83c90f946ea972aa9e6c998d304bdfa517479464 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -274,9 +274,10 @@ static void find_exact_matches(struct string_list *a, struct string_list *b)
        hashmap_clear(&map);
 }
 
-static void diffsize_consume(void *data, char *line, unsigned long len)
+static int diffsize_consume(void *data, char *line, unsigned long len)
 {
        (*(int *)data)++;
+       return 0;
 }
 
 static void diffsize_hunk(void *data, long ob, long on, long nb, long nn,

diff --git a/xdiff-interface.c b/xdiff-interface.c
index 4d20069302b25a133869380bd685e921ddc0bacc..5d8c8c67dc2b22cbddb8a4149e649f786f7ff4bc 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -31,7 +31,7 @@ static int xdiff_out_hunk(void *priv_,
        return 0;
 }
 
-static void consume_one(void *priv_, char *s, unsigned long size)
+static int consume_one(void *priv_, char *s, unsigned long size)
 {
        struct xdiff_emit_state *priv = priv_;
        char *ep;
@@ -43,6 +43,7 @@ static void consume_one(void *priv_, char *s, unsigned long size)
                size -= this_size;
                s += this_size;
        }
+       return 0;
 }
 
 static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)

diff --git a/xdiff-interface.h b/xdiff-interface.h
index 93df26900c2bfa923f1e871924ef319a6786fa72..0198f9632f5022d833dbda7a4a6f1d8a53165635 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -11,7 +11,7 @@
  */
 #define MAX_XDIFF_SIZE (1024UL * 1024 * 1023)
 
-typedef void (*xdiff_emit_line_fn)(void *, char *, unsigned long);
+typedef int (*xdiff_emit_line_fn)(void *, char *, unsigned long);
 typedef void (*xdiff_emit_hunk_fn)(void *data,
                                   long old_begin, long old_nr,
                                   long new_begin, long new_nr,