Commit ba4faf6e492fae42fd948be1013dc6d328d5f65a
2018-02-08T17:15:33
buf_text: remove `offset` parameter of BOM detection function The function to detect a BOM takes an offset where it shall look for a BOM. No caller uses that, and searching for the BOM in the middle of a buffer seems to be very unlikely, as a BOM should only ever exist at file start. Remove the parameter, as it has already caused confusion due to its weirdness.
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
diff --git a/src/buf_text.c b/src/buf_text.c
index 7e6779d..306980b 100644
--- a/src/buf_text.c
+++ b/src/buf_text.c
@@ -188,7 +188,7 @@ bool git_buf_text_is_binary(const git_buf *buf)
git_bom_t bom;
int printable = 0, nonprintable = 0;
- scan += git_buf_text_detect_bom(&bom, buf, 0);
+ scan += git_buf_text_detect_bom(&bom, buf);
if (bom > GIT_BOM_UTF8)
return 1;
@@ -215,18 +215,18 @@ bool git_buf_text_contains_nul(const git_buf *buf)
return (memchr(buf->ptr, '\0', buf->size) != NULL);
}
-int git_buf_text_detect_bom(git_bom_t *bom, const git_buf *buf, size_t offset)
+int git_buf_text_detect_bom(git_bom_t *bom, const git_buf *buf)
{
const char *ptr;
size_t len;
*bom = GIT_BOM_NONE;
- /* need at least 2 bytes after offset to look for any BOM */
- if (buf->size < offset + 2)
+ /* need at least 2 bytes to look for any BOM */
+ if (buf->size < 2)
return 0;
- ptr = buf->ptr + offset;
- len = buf->size - offset;
+ ptr = buf->ptr;
+ len = buf->size;
switch (*ptr++) {
case 0:
@@ -274,7 +274,7 @@ bool git_buf_text_gather_stats(
memset(stats, 0, sizeof(*stats));
/* BOM detection */
- skip = git_buf_text_detect_bom(&stats->bom, buf, 0);
+ skip = git_buf_text_detect_bom(&stats->bom, buf);
if (skip_bom)
scan += skip;
diff --git a/src/buf_text.h b/src/buf_text.h
index 163bef1..726b0ae 100644
--- a/src/buf_text.h
+++ b/src/buf_text.h
@@ -99,11 +99,9 @@ extern bool git_buf_text_contains_nul(const git_buf *buf);
*
* @param bom Set to the type of BOM detected or GIT_BOM_NONE
* @param buf Buffer in which to check the first bytes for a BOM
- * @param offset Offset into buffer to look for BOM
* @return Number of bytes of BOM data (or 0 if no BOM found)
*/
-extern int git_buf_text_detect_bom(
- git_bom_t *bom, const git_buf *buf, size_t offset);
+extern int git_buf_text_detect_bom(git_bom_t *bom, const git_buf *buf);
/**
* Gather stats for a piece of text
diff --git a/src/config_parse.c b/src/config_parse.c
index 49c948c..149550d 100644
--- a/src/config_parse.c
+++ b/src/config_parse.c
@@ -217,7 +217,7 @@ static int skip_bom(git_parse_ctx *parser)
{
git_buf buf = GIT_BUF_INIT_CONST(parser->content, parser->content_len);
git_bom_t bom;
- int bom_offset = git_buf_text_detect_bom(&bom, &buf, 0);
+ int bom_offset = git_buf_text_detect_bom(&bom, &buf);
if (bom == GIT_BOM_UTF8)
git_parse_advance_chars(parser, bom_offset);