Commit df4cba0f2860f35ddea03e09d40ec27b9717db70
2014-07-15T17:27:58
Export git_buf_text_is_binary and git_buf_text_contains_nul. So that users don’t need to implement binary detection themselves.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117
diff --git a/include/git2.h b/include/git2.h
index f749760..2a2ad93 100644
--- a/include/git2.h
+++ b/include/git2.h
@@ -13,6 +13,7 @@
#include "git2/blame.h"
#include "git2/branch.h"
#include "git2/buffer.h"
+#include "git2/buf_text.h"
#include "git2/checkout.h"
#include "git2/cherrypick.h"
#include "git2/clone.h"
diff --git a/include/git2/buf_text.h b/include/git2/buf_text.h
new file mode 100644
index 0000000..29bfca8
--- /dev/null
+++ b/include/git2/buf_text.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_git_buf_text_h__
+#define INCLUDE_git_buf_text_h__
+
+#include "common.h"
+#include "buffer.h"
+
+/**
+ * @file git2/buf_text.h
+ * @brief Buffer text export structure
+ *
+ * @ingroup Git
+ * @{
+ */
+GIT_BEGIN_DECL
+
+/**
+ * Check quickly if buffer looks like it contains binary data
+ *
+ * @param buf Buffer to check
+ * @return 1 if buffer looks like non-text data
+ */
+GIT_EXTERN(int) git_buf_text_is_binary(const git_buf *buf);
+
+/**
+ * Check quickly if buffer contains a NUL byte
+ *
+ * @param buf Buffer to check
+ * @return 1 if buffer contains a NUL byte
+ */
+GIT_EXTERN(int) git_buf_text_contains_nul(const git_buf *buf);
+
+GIT_END_DECL
+
+/** @} */
+
+#endif
diff --git a/src/buf_text.c b/src/buf_text.c
index 8d2b141..0e93696 100644
--- a/src/buf_text.c
+++ b/src/buf_text.c
@@ -176,7 +176,7 @@ int git_buf_text_common_prefix(git_buf *buf, const git_strarray *strings)
return 0;
}
-bool git_buf_text_is_binary(const git_buf *buf)
+int git_buf_text_is_binary(const git_buf *buf)
{
const char *scan = buf->ptr, *end = buf->ptr + buf->size;
git_bom_t bom;
@@ -201,7 +201,7 @@ bool git_buf_text_is_binary(const git_buf *buf)
return ((printable >> 7) < nonprintable);
}
-bool git_buf_text_contains_nul(const git_buf *buf)
+int git_buf_text_contains_nul(const git_buf *buf)
{
return (memchr(buf->ptr, '\0', buf->size) != NULL);
}
diff --git a/src/buf_text.h b/src/buf_text.h
index e753a02..3415ac0 100644
--- a/src/buf_text.h
+++ b/src/buf_text.h
@@ -7,6 +7,7 @@
#ifndef INCLUDE_buf_text_h__
#define INCLUDE_buf_text_h__
+#include "git2/buf_text.h"
#include "buffer.h"
typedef enum {
@@ -78,22 +79,6 @@ extern int git_buf_text_lf_to_crlf(git_buf *tgt, const git_buf *src);
extern int git_buf_text_common_prefix(git_buf *buf, const git_strarray *strs);
/**
- * Check quickly if buffer looks like it contains binary data
- *
- * @param buf Buffer to check
- * @return true if buffer looks like non-text data
- */
-extern bool git_buf_text_is_binary(const git_buf *buf);
-
-/**
- * Check quickly if buffer contains a NUL byte
- *
- * @param buf Buffer to check
- * @return true if buffer contains a NUL byte
- */
-extern bool git_buf_text_contains_nul(const git_buf *buf);
-
-/**
* Check if a buffer begins with a UTF BOM
*
* @param bom Set to the type of BOM detected or GIT_BOM_NONE