Commit Diff

Commit:
4a8520aa6bbd7d1193aabc34e80edce3d18c0239
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
use a constant for max diff context size
Actions:
Patch | Tree
commit - ae9f01af2fe34554f2e98fabe58e56d1d76ca990
commit + 4a8520aa6bbd7d1193aabc34e80edce3d18c0239
blob - 972474021c895f2e1d0b925f2356d655dfbbaceb
blob + 7ea90713e229a1c8e1564ffbb22aa7711a385ce0
--- got/got.c
+++ got/got.c
@@ -460,7 +460,8 @@ cmd_log(int argc, char *argv[])
 			start_commit = optarg;
 			break;
 		case 'C':
-			diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
+			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
+			    &errstr);
 			if (errstr != NULL)
 				err(1, "-C option %s", errstr);
 			break;
blob - 2d8ae7f5341ad85ed33cb1c568a4692af5d57f25
blob + a817a1eabed26be1253b9c113d07a6679a76376b
--- include/got_diff.h
+++ include/got_diff.h
@@ -63,3 +63,5 @@ const struct got_error *got_diff_objects_as_trees(stru
  */
 const struct got_error *got_diff_objects_as_commits(struct got_object *,
     struct got_object *, int, struct got_repository *, FILE *);
+
+#define GOT_DIFF_MAX_CONTEXT	64
blob - b2fe3246d9bd07001e60870521c45f5d37e08ac9
blob + 54ebb2fe2782e84287472096b4dd921107c099c7
--- lib/diffreg.c
+++ lib/diffreg.c
@@ -280,7 +280,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;
+	ds->max_context = GOT_DIFF_MAX_CONTEXT;
 	if (flags & D_IGNORECASE)
 		ds->chrtran = cup2low;
 	else
blob - 82f68df62a56e13c9eedea83c7c8f227f69e0fc4
blob + 2d26c2ee57e5dd3a42e6f75cd713c7700171af50
--- tog/tog.c
+++ tog/tog.c
@@ -1795,7 +1795,7 @@ input_diff_view(struct tog_view **new_view, struct tog
 			}
 			break;
 		case ']':
-			if (s->diff_context < INT_MAX) {
+			if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
 				s->diff_context++;
 				err = create_diff(s);
 			}