diff options
| author | Vicent Marti <tanoku@gmail.com> | 2011-06-03 19:59:16 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2011-06-03 20:01:18 +0200 |
| commit | 0291b5b76bd8dcbac1118533c7a79a619ade766c (patch) | |
| tree | 199f3282d71a1cdbc8ce18fd4b3ab598362d7358 /src/util.h | |
| parent | 1e9b7a09ff3d16c3d7a132cfaacb9d68b253e924 (diff) | |
| download | libgit2-0291b5b76bd8dcbac1118533c7a79a619ade766c.tar.gz | |
odb: Fix loading ODB alternates
Fixed an issue with the `strtokz implementation and added support for
comments and relative paths in the alternates file.
Diffstat (limited to 'src/util.h')
| -rw-r--r-- | src/util.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/util.h b/src/util.h index e5a2ebe5f..72e3a9c68 100644 --- a/src/util.h +++ b/src/util.h @@ -139,8 +139,7 @@ GIT_INLINE(int) git__is_sizet(git_off_t p) # define git__rotl(v, s) (uint32_t)(((uint32_t)(v) << (s)) | ((uint32_t)(v) >> (32 - (s)))) #endif -extern char *git__strtok(char *output, char *src, char *delimit); -extern char *git__strtok_keep(char *output, char *src, char *delimit); +extern char *git__strtok(char **end, const char *sep); extern void git__strntolower(char *str, int len); extern void git__strtolower(char *str); |