kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

[PATCH] diffcore-pickaxe: switch to "counting" behaviour. 

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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
maint
Junio C Hamano 2005-07-23 16:35:25 -07:00 committed by Linus Torvalds
parent 399144f21c
commit 2002eed6c9
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
diffcore-pickaxe.c
View File

@ -5,19 +5,30 @@
#include "diff.h" #include "diff.h"
#include "diffcore.h" #include "diffcore.h"


static int contains(struct diff_filespec *one, static unsigned int contains(struct diff_filespec *one,
const char *needle, unsigned long len) const char *needle, unsigned long len)
{ {
unsigned int cnt;
unsigned long offset, sz; unsigned long offset, sz;
const char *data; const char *data;
if (diff_populate_filespec(one, 0)) if (diff_populate_filespec(one, 0))
return 0; return 0;

sz = one->size; sz = one->size;
data = one->data; data = one->data;
for (offset = 0; offset + len <= sz; offset++) cnt = 0;
if (!strncmp(needle, data + offset, len))
return 1; /* Yes, I've heard of strstr(), but the thing is *data may
return 0; * 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) void diffcore_pickaxe(const char *needle, int opts)