diff options
| author | Sven Strickroth <email@cs-ware.de> | 2012-10-02 17:21:07 +0200 |
|---|---|---|
| committer | Sven Strickroth <email@cs-ware.de> | 2012-10-02 17:21:07 +0200 |
| commit | 4258d4832b9525ed4e21597a9e63a6dd5aa43507 (patch) | |
| tree | d7b72e1fe13cb8cc31ef818f8acaba8cc3dab2ea /src/repository.c | |
| parent | 8b3de0b6b8104019def3ddedcf2750539ea7409f (diff) | |
| download | libgit2-4258d4832b9525ed4e21597a9e63a6dd5aa43507.tar.gz | |
Rename xdr to xdg
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Diffstat (limited to 'src/repository.c')
| -rw-r--r-- | src/repository.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/repository.c b/src/repository.c index d1cf47fe5..e9c1bdf47 100644 --- a/src/repository.c +++ b/src/repository.c @@ -445,7 +445,7 @@ static int load_config( git_config **out, git_repository *repo, const char *global_config_path, - const char *xdr_config_path, + const char *xdg_config_path, const char *system_config_path) { git_buf config_path = GIT_BUF_INIT; @@ -470,8 +470,8 @@ static int load_config( goto on_error; } - if (xdr_config_path != NULL) { - if (git_config_add_file_ondisk(cfg, xdr_config_path, 2) < 0) + if (xdg_config_path != NULL) { + if (git_config_add_file_ondisk(cfg, xdg_config_path, 2) < 0) goto on_error; } @@ -493,23 +493,23 @@ on_error: int git_repository_config__weakptr(git_config **out, git_repository *repo) { if (repo->_config == NULL) { - git_buf global_buf = GIT_BUF_INIT, xdr_buf = GIT_BUF_INIT, system_buf = GIT_BUF_INIT; + git_buf global_buf = GIT_BUF_INIT, xdg_buf = GIT_BUF_INIT, system_buf = GIT_BUF_INIT; int res; const char *global_config_path = NULL; - const char *xdr_config_path = NULL; + const char *xdg_config_path = NULL; const char *system_config_path = NULL; if (git_config_find_global_r(&global_buf) == 0) global_config_path = global_buf.ptr; - if (git_config_find_xdr_r(&xdr_buf) == 0) - xdr_config_path = xdr_buf.ptr; + if (git_config_find_xdg_r(&xdg_buf) == 0) + xdg_config_path = xdg_buf.ptr; if (git_config_find_system_r(&system_buf) == 0) system_config_path = system_buf.ptr; - res = load_config(&repo->_config, repo, global_config_path, xdr_config_path, system_config_path); + res = load_config(&repo->_config, repo, global_config_path, xdg_config_path, system_config_path); git_buf_free(&global_buf); git_buf_free(&system_buf); |