Imported Upstream version 2.4.0

[platform/upstream/git.git] / line-log.c

diff --git a/line-log.c b/line-log.c
index d4e29a5..a490efe 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -237,7 +237,7 @@ static void diff_ranges_release(struct diff_ranges *diff)
        range_set_release(&diff->target);
 }
 
-void line_log_data_init(struct line_log_data *r)
+static void line_log_data_init(struct line_log_data *r)
 {
        memset(r, 0, sizeof(struct line_log_data));
        range_set_init(&r->ranges, 0);
@@ -325,7 +325,7 @@ static int collect_diff_cb(long start_a, long count_a,
        return 0;
 }
 
-static int collect_diff(mmfile_t *parent, mmfile_t *target, struct diff_ranges *out)
+static void collect_diff(mmfile_t *parent, mmfile_t *target, struct diff_ranges *out)
 {
        struct collect_diff_cbdata cbdata = {NULL};
        xpparam_t xpp;
@@ -340,7 +340,7 @@ static int collect_diff(mmfile_t *parent, mmfile_t *target, struct diff_ranges *
        xecfg.hunk_func = collect_diff_cb;
        memset(&ecb, 0, sizeof(ecb));
        ecb.priv = &cbdata;
-       return xdi_diff(parent, target, &xpp, &xecfg, &ecb);
+       xdi_diff(parent, target, &xpp, &xecfg, &ecb);
 }
 
 /*
@@ -575,7 +575,7 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args)
 
                name_part = skip_range_arg(item->string);
                if (!name_part || *name_part != ':' || !name_part[1])
-                       die("-L argument not 'start,end:file' or ':funcname:file': %s",
+                       die("-L argument '%s' not of the form start,end:file",
                            item->string);
                range_part = xstrndup(item->string, name_part - item->string);
                name_part++;
@@ -1030,8 +1030,7 @@ static int process_diff_filepair(struct rev_info *rev,
        }
 
        diff_ranges_init(&diff);
-       if (collect_diff(&file_parent, &file_target, &diff))
-               die("unable to generate diff for %s", pair->one->path);
+       collect_diff(&file_parent, &file_target, &diff);
 
        /* NEEDSWORK should apply some heuristics to prevent mismatches */
        free(rg->path);