proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-11 10:25:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oidmap: remove GIT__USE_OIDMAP macro

Browse Source
This commit is contained in:
Patrick Steinhardt 2017-01-27 15:23:15 +01:00
parent 659f5d07d5
commit 0d71690549
10 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cache.c
View File

@ -15,8 +15,6 @@
#include "object.h" #include "object.h"
#include "git2/oid.h" #include "git2/oid.h"
GIT__USE_OIDMAP
bool git_cache__enabled = true; bool git_cache__enabled = true;
ssize_t git_cache__max_storage = (256 * 1024 * 1024); ssize_t git_cache__max_storage = (256 * 1024 * 1024);
git_atomic_ssize git_cache__current_storage = {0}; git_atomic_ssize git_cache__current_storage = {0};

2
src/describe.c
View File

@ -19,8 +19,6 @@
#include "vector.h" #include "vector.h"
#include "repository.h" #include "repository.h"
GIT__USE_OIDMAP
/* Ported from https://github.com/git/git/blob/89dde7882f71f846ccd0359756d27bebc31108de/builtin/describe.c */ /* Ported from https://github.com/git/git/blob/89dde7882f71f846ccd0359756d27bebc31108de/builtin/describe.c */
struct commit_name { struct commit_name {

2
src/indexer.c
View File

@ -18,8 +18,6 @@
#include "oidmap.h" #include "oidmap.h"
#include "zstream.h" #include "zstream.h"
GIT__USE_OIDMAP
extern git_mutex git__mwindow_mutex; extern git_mutex git__mwindow_mutex;
#define UINT31_MAX (0x7FFFFFFF) #define UINT31_MAX (0x7FFFFFFF)

2
src/odb_mempack.c
View File

@ -18,8 +18,6 @@
#include "git2/types.h" #include "git2/types.h"
#include "git2/pack.h" #include "git2/pack.h"
GIT__USE_OIDMAP
struct memobject { struct memobject {
git_oid oid; git_oid oid;
size_t len; size_t len;

7
src/oidmap.c
View File

@ -7,6 +7,13 @@
#include "oidmap.h" #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) __KHASH_IMPL(oid, static kh_inline, const git_oid *, void *, 1, git_oidmap_hash, git_oid_equal)
git_oidmap *git_oidmap_alloc() git_oidmap *git_oidmap_alloc()

10
src/oidmap.h
View File

@ -20,16 +20,6 @@
__KHASH_TYPE(oid, const git_oid *, void *) __KHASH_TYPE(oid, const git_oid *, void *)
typedef khash_t(oid) git_oidmap; 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); git_oidmap *git_oidmap_alloc(void);
#define git_oidmap_free(h) git_oidmap__free(h); (h) = NULL #define git_oidmap_free(h) git_oidmap__free(h); (h) = NULL
void git_oidmap__free(git_oidmap *map); void git_oidmap__free(git_oidmap *map);

2
src/pack-objects.c
View File

@ -41,8 +41,6 @@ struct pack_write_context {
git_transfer_progress *stats; git_transfer_progress *stats;
}; };
GIT__USE_OIDMAP
#ifdef GIT_THREADS #ifdef GIT_THREADS
#define GIT_PACKBUILDER__MUTEX_OP(pb, mtx, op) do { \ #define GIT_PACKBUILDER__MUTEX_OP(pb, mtx, op) do { \

1
src/pack.c
View File

@ -17,7 +17,6 @@
#include <zlib.h> #include <zlib.h>
GIT__USE_OFFMAP GIT__USE_OFFMAP
GIT__USE_OIDMAP
static int packfile_open(struct git_pack_file *p); 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); static git_off_t nth_packed_object_offset(const struct git_pack_file *p, uint32_t n);

2
src/revwalk.c
View File

@ -15,8 +15,6 @@
#include "merge.h" #include "merge.h"
#include "vector.h" #include "vector.h"
GIT__USE_OIDMAP
git_commit_list_node *git_revwalk__commit_lookup( git_commit_list_node *git_revwalk__commit_lookup(
git_revwalk *walk, const git_oid *oid) git_revwalk *walk, const git_oid *oid)
{ {

2
tests/core/oidmap.c
View File

@ -1,8 +1,6 @@
#include "clar_libgit2.h" #include "clar_libgit2.h"
#include "oidmap.h" #include "oidmap.h"
GIT__USE_OIDMAP
typedef struct { typedef struct {
git_oid oid; git_oid oid;
size_t extra; size_t extra;