diff options
| author | Patrick Steinhardt <ps@pks.im> | 2017-02-17 12:41:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-17 12:41:05 +0100 |
| commit | d0c72a92ef530962e19a560001f4032893681127 (patch) | |
| tree | 3810eea20d5acbb373c34874cf115cb01998f1d6 /src/tree.c | |
| parent | 021f4943a9482355c47122da4911c5272cefdb8d (diff) | |
| parent | 8f1ff26bd3c46d7f4f20b6776fd2edac647f3335 (diff) | |
| download | libgit2-d0c72a92ef530962e19a560001f4032893681127.tar.gz | |
Merge pull request #4092 from pks-t/pks/khash-cleanups
khash cleanups
Diffstat (limited to 'src/tree.c')
| -rw-r--r-- | src/tree.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/tree.c b/src/tree.c index 26da296d5..dba2060c3 100644 --- a/src/tree.c +++ b/src/tree.c @@ -20,8 +20,6 @@ #define TREE_ENTRY_CHECK_NAMELEN(n) \ if (n > UINT16_MAX) { giterr_set(GITERR_INVALID, "tree entry path too long"); } -GIT__USE_STRMAP - static bool valid_filemode(const int filemode) { return (filemode == GIT_FILEMODE_TREE @@ -505,7 +503,7 @@ static int append_entry( entry->attr = (uint16_t)filemode; - git_strmap_insert(bld->map, entry->filename, entry, error); + git_strmap_insert(bld->map, entry->filename, entry, &error); if (error < 0) { git_tree_entry_free(entry); giterr_set(GITERR_TREE, "failed to append entry %s to the tree builder", filename); @@ -754,7 +752,7 @@ int git_treebuilder_insert( entry = alloc_entry(filename, strlen(filename), id); GITERR_CHECK_ALLOC(entry); - git_strmap_insert(bld->map, entry->filename, entry, error); + git_strmap_insert(bld->map, entry->filename, entry, &error); if (error < 0) { git_tree_entry_free(entry); |