diff options
| -rw-r--r-- | src/cache.c | 2 | ||||
| -rw-r--r-- | src/describe.c | 2 | ||||
| -rw-r--r-- | src/indexer.c | 2 | ||||
| -rw-r--r-- | src/odb_mempack.c | 2 | ||||
| -rw-r--r-- | src/oidmap.c | 7 | ||||
| -rw-r--r-- | src/oidmap.h | 10 | ||||
| -rw-r--r-- | src/pack-objects.c | 2 | ||||
| -rw-r--r-- | src/pack.c | 1 | ||||
| -rw-r--r-- | src/revwalk.c | 2 | ||||
| -rw-r--r-- | tests/core/oidmap.c | 2 |
10 files changed, 7 insertions, 25 deletions
diff --git a/src/cache.c b/src/cache.c index f76e72d93..c92a3a78a 100644 --- a/src/cache.c +++ b/src/cache.c @@ -15,8 +15,6 @@ #include "object.h" #include "git2/oid.h" -GIT__USE_OIDMAP - bool git_cache__enabled = true; ssize_t git_cache__max_storage = (256 * 1024 * 1024); git_atomic_ssize git_cache__current_storage = {0}; diff --git a/src/describe.c b/src/describe.c index 152385836..4a1e25378 100644 --- a/src/describe.c +++ b/src/describe.c @@ -19,8 +19,6 @@ #include "vector.h" #include "repository.h" -GIT__USE_OIDMAP - /* Ported from https://github.com/git/git/blob/89dde7882f71f846ccd0359756d27bebc31108de/builtin/describe.c */ struct commit_name { diff --git a/src/indexer.c b/src/indexer.c index 3e88bc7ba..869e2299f 100644 --- a/src/indexer.c +++ b/src/indexer.c @@ -18,8 +18,6 @@ #include "oidmap.h" #include "zstream.h" -GIT__USE_OIDMAP - extern git_mutex git__mwindow_mutex; #define UINT31_MAX (0x7FFFFFFF) diff --git a/src/odb_mempack.c b/src/odb_mempack.c index 52f8089e1..d6f2fb4af 100644 --- a/src/odb_mempack.c +++ b/src/odb_mempack.c @@ -18,8 +18,6 @@ #include "git2/types.h" #include "git2/pack.h" -GIT__USE_OIDMAP - struct memobject { git_oid oid; size_t len; diff --git a/src/oidmap.c b/src/oidmap.c index ab821df8d..0df9a4f42 100644 --- a/src/oidmap.c +++ b/src/oidmap.c @@ -7,6 +7,13 @@ #include "oidmap.h" +GIT_INLINE(khint_t) git_oidmap_hash(const git_oid *oid) +{ + khint_t h; + memcpy(&h, oid, sizeof(khint_t)); + return h; +} + __KHASH_IMPL(oid, static kh_inline, const git_oid *, void *, 1, git_oidmap_hash, git_oid_equal) git_oidmap *git_oidmap_alloc() diff --git a/src/oidmap.h b/src/oidmap.h index bfad8e2ad..a3f8961dc 100644 --- a/src/oidmap.h +++ b/src/oidmap.h @@ -20,16 +20,6 @@ __KHASH_TYPE(oid, const git_oid *, void *) typedef khash_t(oid) git_oidmap; -GIT_INLINE(khint_t) git_oidmap_hash(const git_oid *oid) -{ - khint_t h; - memcpy(&h, oid, sizeof(khint_t)); - return h; -} - -#define GIT__USE_OIDMAP \ - __KHASH_IMPL(oid, static kh_inline, const git_oid *, void *, 1, git_oidmap_hash, git_oid_equal) - git_oidmap *git_oidmap_alloc(void); #define git_oidmap_free(h) git_oidmap__free(h); (h) = NULL void git_oidmap__free(git_oidmap *map); diff --git a/src/pack-objects.c b/src/pack-objects.c index 1b4ec9d15..58b7b94b3 100644 --- a/src/pack-objects.c +++ b/src/pack-objects.c @@ -41,8 +41,6 @@ struct pack_write_context { git_transfer_progress *stats; }; -GIT__USE_OIDMAP - #ifdef GIT_THREADS #define GIT_PACKBUILDER__MUTEX_OP(pb, mtx, op) do { \ diff --git a/src/pack.c b/src/pack.c index 4e30ca7c3..9be051e64 100644 --- a/src/pack.c +++ b/src/pack.c @@ -17,7 +17,6 @@ #include <zlib.h> GIT__USE_OFFMAP -GIT__USE_OIDMAP static int packfile_open(struct git_pack_file *p); static git_off_t nth_packed_object_offset(const struct git_pack_file *p, uint32_t n); diff --git a/src/revwalk.c b/src/revwalk.c index ac5400253..6d08164ba 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -15,8 +15,6 @@ #include "merge.h" #include "vector.h" -GIT__USE_OIDMAP - git_commit_list_node *git_revwalk__commit_lookup( git_revwalk *walk, const git_oid *oid) { diff --git a/tests/core/oidmap.c b/tests/core/oidmap.c index 92b8c1937..617da5483 100644 --- a/tests/core/oidmap.c +++ b/tests/core/oidmap.c @@ -1,8 +1,6 @@ #include "clar_libgit2.h" #include "oidmap.h" -GIT__USE_OIDMAP - typedef struct { git_oid oid; size_t extra; |