Commit 83290b45b037bedb9c814d4afaf111edb4ab7754
2019-09-22T15:59:06
Remove return value from diffreg's fetch() The last use of this was removed in 0165cdf03ffac4c24334979832ad27554913d54c over a year ago.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/lib/diffreg.c b/lib/diffreg.c
index 9f0da90..fc01cc3 100644
--- a/lib/diffreg.c
+++ b/lib/diffreg.c
@@ -186,7 +186,7 @@ static int change(FILE *, struct got_diff_changes *, struct got_diff_state *, s
static void sort(struct line *, int);
static void print_header(FILE *, struct got_diff_state *, struct got_diff_args *, const char *, const char *);
static int asciifile(FILE *);
-static int fetch(FILE *, struct got_diff_state *, struct got_diff_args *, long *, int, int, FILE *, int, int);
+static void fetch(FILE *, struct got_diff_state *, struct got_diff_args *, long *, int, int, FILE *, int, int);
static int newcand(struct got_diff_state *, int, int, int, int *);
static int search(struct got_diff_state *, int *, int, int);
static int skipline(FILE *);
@@ -921,8 +921,6 @@ change(FILE *outfile, struct got_diff_changes *changes,
const char *file1, FILE *f1, const char *file2, FILE *f2,
int a, int b, int c, int d, int *pflags)
{
- int i;
-
if (a > b && c > d)
return (0);
@@ -985,19 +983,19 @@ change(FILE *outfile, struct got_diff_changes *changes,
if (a <= b && c <= d)
diff_output(outfile, "---\n");
}
- i = fetch(outfile, ds, args, ds->ixnew, c, d, f2,
+ fetch(outfile, ds, args, ds->ixnew, c, d, f2,
args->diff_format == D_NORMAL ? '>' : '\0', *pflags);
return (0);
}
-static int
+static void
fetch(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
long *f, int a, int b, FILE *lb, int ch, int flags)
{
int i, j, c, col, nc;
if (a > b)
- return (0);
+ return;
for (i = a; i <= b; i++) {
fseek(lb, f[i - 1], SEEK_SET);
nc = f[i] - f[i - 1];
@@ -1014,7 +1012,7 @@ fetch(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
if ((c = getc(lb)) == EOF) {
diff_output(outfile, "\n\\ No newline at end of "
"file\n");
- return (0);
+ return;
}
if (c == '\t' && (flags & D_EXPANDTABS)) {
do {
@@ -1026,7 +1024,6 @@ fetch(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
}
}
}
- return (0);
}
/*