summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-06-05 02:36:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-05 06:07:00 (GMT)
commit6bfce93e04d13ecb42008a3cf214cc892f480f0c (patch)
tree1a6a391821add13a0e57f3e4b6df0a272fb76834 /grep.c
parent20f1eb6b46645115695329a371d412eb3e714865 (diff)
downloadgit-6bfce93e04d13ecb42008a3cf214cc892f480f0c.zip
git-6bfce93e04d13ecb42008a3cf214cc892f480f0c.tar.gz
git-6bfce93e04d13ecb42008a3cf214cc892f480f0c.tar.bz2
Move buffer_is_binary() to xdiff-interface.h
We already have two instances where we want to determine if a buffer contains binary data as opposed to text. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.c')
-rw-r--r--grep.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/grep.c b/grep.c
index fcc6762..f67d671 100644
--- a/grep.c
+++ b/grep.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "grep.h"
+#include "xdiff-interface.h"
void append_grep_pattern(struct grep_opt *opt, const char *pat,
const char *origin, int no, enum grep_pat_token t)
@@ -232,17 +233,6 @@ static void show_line(struct grep_opt *opt, const char *bol, const char *eol,
printf("%.*s\n", (int)(eol-bol), bol);
}
-/*
- * NEEDSWORK: share code with diff.c
- */
-#define FIRST_FEW_BYTES 8000
-static int buffer_is_binary(const char *ptr, unsigned long size)
-{
- if (FIRST_FEW_BYTES < size)
- size = FIRST_FEW_BYTES;
- return !!memchr(ptr, 0, size);
-}
-
static int fixmatch(const char *pattern, char *line, regmatch_t *match)
{
char *hit = strstr(line, pattern);