diff options
| author | Vicent Marti <vicent@github.com> | 2014-02-25 10:46:41 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-02-25 10:46:41 +0100 |
| commit | cb81c3a764447ceb2cd693935bf970138ea60ccc (patch) | |
| tree | aaccb862502fff37d3c5d71a191e20e5a16469b2 /src/settings.c | |
| parent | 1c8b339d3483bb5262174908b376dc1152787021 (diff) | |
| parent | 83634d38be2d0a1ac006d912216cd6787c2b1542 (diff) | |
| download | libgit2-cb81c3a764447ceb2cd693935bf970138ea60ccc.tar.gz | |
Merge pull request #2138 from ethomson/sysdir
Move system directory cache out of utils
Diffstat (limited to 'src/settings.c')
| -rw-r--r-- | src/settings.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/settings.c b/src/settings.c index 7c2a30377..3856735f7 100644 --- a/src/settings.c +++ b/src/settings.c @@ -7,7 +7,7 @@ #include <git2.h> #include "common.h" -#include "fileops.h" +#include "sysdir.h" #include "cache.h" void git_libgit2_version(int *major, int *minor, int *rev) @@ -36,14 +36,14 @@ int git_libgit2_capabilities() extern size_t git_mwindow__window_size; extern size_t git_mwindow__mapped_limit; -static int config_level_to_futils_dir(int config_level) +static int config_level_to_sysdir(int config_level) { int val = -1; switch (config_level) { - case GIT_CONFIG_LEVEL_SYSTEM: val = GIT_FUTILS_DIR_SYSTEM; break; - case GIT_CONFIG_LEVEL_XDG: val = GIT_FUTILS_DIR_XDG; break; - case GIT_CONFIG_LEVEL_GLOBAL: val = GIT_FUTILS_DIR_GLOBAL; break; + case GIT_CONFIG_LEVEL_SYSTEM: val = GIT_SYSDIR_SYSTEM; break; + case GIT_CONFIG_LEVEL_XDG: val = GIT_SYSDIR_XDG; break; + case GIT_CONFIG_LEVEL_GLOBAL: val = GIT_SYSDIR_GLOBAL; break; default: giterr_set( GITERR_INVALID, "Invalid config path selector %d", config_level); @@ -77,17 +77,17 @@ int git_libgit2_opts(int key, ...) break; case GIT_OPT_GET_SEARCH_PATH: - if ((error = config_level_to_futils_dir(va_arg(ap, int))) >= 0) { + if ((error = config_level_to_sysdir(va_arg(ap, int))) >= 0) { char *out = va_arg(ap, char *); size_t outlen = va_arg(ap, size_t); - error = git_futils_dirs_get_str(out, outlen, error); + error = git_sysdir_get_str(out, outlen, error); } break; case GIT_OPT_SET_SEARCH_PATH: - if ((error = config_level_to_futils_dir(va_arg(ap, int))) >= 0) - error = git_futils_dirs_set(error, va_arg(ap, const char *)); + if ((error = config_level_to_sysdir(va_arg(ap, int))) >= 0) + error = git_sysdir_set(error, va_arg(ap, const char *)); break; case GIT_OPT_SET_CACHE_OBJECT_LIMIT: @@ -116,12 +116,12 @@ int git_libgit2_opts(int key, ...) char *out = va_arg(ap, char *); size_t outlen = va_arg(ap, size_t); - error = git_futils_dirs_get_str(out, outlen, GIT_FUTILS_DIR_TEMPLATE); + error = git_sysdir_get_str(out, outlen, GIT_SYSDIR_TEMPLATE); } break; case GIT_OPT_SET_TEMPLATE_PATH: - error = git_futils_dirs_set(GIT_FUTILS_DIR_TEMPLATE, va_arg(ap, const char *)); + error = git_sysdir_set(GIT_SYSDIR_TEMPLATE, va_arg(ap, const char *)); break; } |