Commit 7673568311fd48da1f7f7c2b331a72a4c8744f83
2018-04-02T16:37:53
move diffreg's max_context into struct got_diff_state
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
diff --git a/lib/diffreg.c b/lib/diffreg.c
index cb18b5a..54204de 100644
--- a/lib/diffreg.c
+++ b/lib/diffreg.c
@@ -291,6 +291,7 @@ got_diffreg(int *rval, FILE *f1, FILE *f2, int flags,
ds->lastline = 0;
ds->lastmatchline = 0;
ds->context_vec_ptr = ds->context_vec_start - 1;
+ ds->max_context = 64;
if (flags & D_IGNORECASE)
ds->chrtran = cup2low;
else
@@ -966,7 +967,6 @@ change(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
const char *file1, FILE *f1, const char *file2, FILE *f2,
int a, int b, int c, int d, int *pflags)
{
- static size_t max_context = 64;
int i;
restart:
@@ -1013,14 +1013,16 @@ proceed:
* Allocate change records as needed.
*/
if (ds->context_vec_ptr == ds->context_vec_end - 1) {
- ptrdiff_t offset = ds->context_vec_ptr - ds->context_vec_start;
- max_context <<= 1;
+ ptrdiff_t offset;
+ offset = ds->context_vec_ptr - ds->context_vec_start;
+ ds->max_context <<= 1;
ds->context_vec_start =
- reallocarray(ds->context_vec_start, max_context,
+ reallocarray(ds->context_vec_start, ds->max_context,
sizeof(*ds->context_vec_start));
if (ds->context_vec_start == NULL)
return (-1);
- ds->context_vec_end = ds->context_vec_start + max_context;
+ ds->context_vec_end = ds->context_vec_start +
+ ds->max_context;
ds->context_vec_ptr = ds->context_vec_start + offset;
}
if (ds->anychange == 0) {
diff --git a/lib/got_lib_diff.h b/lib/got_lib_diff.h
index d035103..ffaacf3 100644
--- a/lib/got_lib_diff.h
+++ b/lib/got_lib_diff.h
@@ -107,6 +107,7 @@ struct got_diff_state {
int lastline;
int lastmatchline;
struct stat stb1, stb2;
+ size_t max_context;
};
struct got_diff_args {