[PATCH] diffcore-pickaxe: switch to "counting" behaviour.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] diffcore-pickaxe: switch to "counting" behaviour. · Junio C Hamano <hidden>
Instead of finding old/new pair that one side has and the other side does not have the specified string, find old/new pair that contains the specified string as a substring different number of times. This would still not catch a case where you introduce two static variable declarations and remove two static function definitions from a file with -S"static", but would make it behave a bit more intuitively. Signed-off-by: Junio C Hamano <redacted> --- *** Linus, the "counting" behaviour that came up in our private *** exchange was brought up independently by Paul. I think it *** is a good compromise. diffcore-pickaxe.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) 7532cfc15932595d679c16ae007f9a910a5b1d1e
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c@@ -5,19 +5,30 @@ #include "diff.h" #include "diffcore.h" -static int contains(struct diff_filespec *one, - const char *needle, unsigned long len) +static unsigned int contains(struct diff_filespec *one, + const char *needle, unsigned long len) { + unsigned int cnt; unsigned long offset, sz; const char *data; if (diff_populate_filespec(one, 0)) return 0; + sz = one->size; data = one->data; - for (offset = 0; offset + len <= sz; offset++) - if (!strncmp(needle, data + offset, len)) - return 1; - return 0; + cnt = 0; + + /* Yes, I've heard of strstr(), but the thing is *data may + * not be NUL terminated. Sue me. + */ + for (offset = 0; offset + len <= sz; offset++) { + /* we count non-overlapping occurrences of needle */ + if (!memcmp(needle, data + offset, len)) { + offset += len - 1; + cnt++; + } + } + return cnt; } void diffcore_pickaxe(const char *needle, int opts)