diff options
| author | Russell Belfer <rb@github.com> | 2012-11-28 09:58:48 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-11-28 09:58:48 -0800 |
| commit | 7bf87ab6987cf6b9e166e23d2d9dbdcd2511fb32 (patch) | |
| tree | dcc8a92ce69b2a0d9d8cca98d67f0cc71177ce40 /src/pathspec.c | |
| parent | 693021262ba0eeac2923bbce1b2262717019c807 (diff) | |
| download | libgit2-7bf87ab6987cf6b9e166e23d2d9dbdcd2511fb32.tar.gz | |
Consolidate text buffer functions
There are many scattered functions that look into the contents of
buffers to do various text manipulations (such as escaping or
unescaping data, calculating text stats, guessing if content is
binary, etc). This groups all those functions together into a
new file and converts the code to use that.
This has two enhancements to existing functionality. The old
text stats function is significantly rewritten and the BOM
detection code was extended (although largely we can't deal with
anything other than a UTF8 BOM).
Diffstat (limited to 'src/pathspec.c')
| -rw-r--r-- | src/pathspec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pathspec.c b/src/pathspec.c index fc6547afe..993b44667 100644 --- a/src/pathspec.c +++ b/src/pathspec.c @@ -6,6 +6,7 @@ */ #include "pathspec.h" +#include "buf_text.h" #include "attr_file.h" /* what is the common non-wildcard prefix for all items in the pathspec */ @@ -15,7 +16,7 @@ char *git_pathspec_prefix(const git_strarray *pathspec) const char *scan; if (!pathspec || !pathspec->count || - git_buf_common_prefix(&prefix, pathspec) < 0) + git_buf_text_common_prefix(&prefix, pathspec) < 0) return NULL; /* diff prefix will only be leading non-wildcards */ @@ -31,7 +32,7 @@ char *git_pathspec_prefix(const git_strarray *pathspec) return NULL; } - git_buf_unescape(&prefix); + git_buf_text_unescape(&prefix); return git_buf_detach(&prefix); } |