summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2017-02-21 15:14:04 +0100
committerPatrick Steinhardt <ps@pks.im>2017-02-21 16:17:36 +0100
commitce6f61daf0e1985d615e640102b5496ff92e401c (patch)
treeb55f7f025669290f44ef0f20036d0928458b4a0c
parentc11510103d9510f1a4b6e3da90464bcef52250c9 (diff)
downloadlibgit2-ce6f61daf0e1985d615e640102b5496ff92e401c.tar.gz
attrcache: remove useless `do_init` indirection
Remove useless indirection from `git_attr_cache__init` to `git_attr_cache__do_init`. The difference is that the `git_attr_cache__init` macro first checks if the cache is already initialized and, if so, not call `git_attr_cache__do_init`. But actually, `git_attr_cache__do_init` already does the same thing and returns immediately if the cache is already initialized. Remove the indirection.
-rw-r--r--src/attrcache.c2
-rw-r--r--src/attrcache.h5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/attrcache.c b/src/attrcache.c
index 1812376ea..4df14ee2c 100644
--- a/src/attrcache.c
+++ b/src/attrcache.c
@@ -354,7 +354,7 @@ static void attr_cache__free(git_attr_cache *cache)
git__free(cache);
}
-int git_attr_cache__do_init(git_repository *repo)
+int git_attr_cache__init(git_repository *repo)
{
int ret = 0;
git_attr_cache *cache = git_repository_attr_cache(repo);
diff --git a/src/attrcache.h b/src/attrcache.h
index 44e1ffdce..b91edd3e8 100644
--- a/src/attrcache.h
+++ b/src/attrcache.h
@@ -22,10 +22,7 @@ typedef struct {
git_pool pool;
} git_attr_cache;
-extern int git_attr_cache__do_init(git_repository *repo);
-
-#define git_attr_cache__init(REPO) \
- (git_repository_attr_cache(REPO) ? 0 : git_attr_cache__do_init(REPO))
+extern int git_attr_cache__init(git_repository *repo);
/* get file - loading and reload as needed */
extern int git_attr_cache__get(