Commit f571bb85169c90466112df17c15064e65961f877
2019-10-06T17:36:20
convert error handling in diff3.c's repos() to struct got_error
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
diff --git a/lib/diff3.c b/lib/diff3.c
index 584764a..5ebdc20 100644
--- a/lib/diff3.c
+++ b/lib/diff3.c
@@ -165,7 +165,7 @@ static const struct got_error *merge(size_t, size_t, struct diff3_state *);
static void change(int, struct range *, int, struct diff3_state *);
static void keep(int, struct range *, struct diff3_state *);
static void prange(struct range *, struct diff3_state *);
-static void repos(int, struct diff3_state *);
+static const struct got_error *repos(int, struct diff3_state *);
static void separate(const char *, struct diff3_state *);
static const struct got_error *increase(struct diff3_state *);
static const struct got_error *diff3_internal(char *, char *, char *,
@@ -882,6 +882,7 @@ skip(int i, int from, char *pr, struct diff3_state *d3s)
static const struct got_error *
duplicate(int *dpl, struct range *r1, struct range *r2, struct diff3_state *d3s)
{
+ const struct got_error *err = NULL;
int c,d;
int nchar;
int nline;
@@ -903,24 +904,28 @@ duplicate(int *dpl, struct range *r1, struct range *r2, struct diff3_state *d3s)
if (d == EOF)
return got_ferror(d3s->fp[1], GOT_ERR_EOF);
nchar++;
- if (c != d) {
- repos(nchar, d3s);
- return NULL;
- }
+ if (c != d)
+ return repos(nchar, d3s);
} while (c != '\n');
}
- repos(nchar, d3s);
+ err = repos(nchar, d3s);
+ if (err)
+ return err;
*dpl = 1;
return NULL;
}
-static void
+static const struct got_error *
repos(int nchar, struct diff3_state *d3s)
{
int i;
- for (i = 0; i < 2; i++)
- (void)fseek(d3s->fp[i], (long)-nchar, SEEK_CUR);
+ for (i = 0; i < 2; i++) {
+ if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
+ return got_ferror(d3s->fp[i], GOT_ERR_IO);
+ }
+
+ return NULL;
}
/*