summaryrefslogtreecommitdiff
path: root/diff.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-16 06:27:23 (GMT)
commit634cd48a8afdd920fa26c8ec3ae43e96c82c81f2 (patch)
treeef740f010a3a287514ce61583b8e92581621fecf /diff.c
parentfa0c87c34471286b6c261c781a45ed090135295c (diff)
downloadgit-634cd48a8afdd920fa26c8ec3ae43e96c82c81f2.zip
git-634cd48a8afdd920fa26c8ec3ae43e96c82c81f2.tar.gz
git-634cd48a8afdd920fa26c8ec3ae43e96c82c81f2.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. [jc: cherry-picked 6bfce93e from 'master'] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/diff.c b/diff.c
index af282dd..dc6da5e 100644
--- a/diff.c
+++ b/diff.c
@@ -1107,10 +1107,8 @@ static void setup_diff_attr_check(struct git_attr_check *check)
check->attr = attr_diff;
}
-#define FIRST_FEW_BYTES 8000
static int file_is_binary(struct diff_filespec *one)
{
- unsigned long sz;
struct git_attr_check attr_diff_check;
setup_diff_attr_check(&attr_diff_check);
@@ -1127,10 +1125,7 @@ static int file_is_binary(struct diff_filespec *one)
return 0;
diff_populate_filespec(one, 0);
}
- sz = one->size;
- if (FIRST_FEW_BYTES < sz)
- sz = FIRST_FEW_BYTES;
- return !!memchr(one->data, 0, sz);
+ return buffer_is_binary(one->data, one->size);
}
static void builtin_diff(const char *name_a,