From 3ee078c0f7ed278be4839a6bde7dce29a614d336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Tue, 13 Nov 2012 13:46:17 -0800 Subject: [PATCH] config: rename get_config_entry -> config_entry We're already in the git_config namespace, there is no need to repeat it. --- include/git2/config.h | 2 +- src/config.c | 2 +- tests-clar/config/read.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/git2/config.h b/include/git2/config.h index e417cb379..b427b8598 100644 --- a/include/git2/config.h +++ b/include/git2/config.h @@ -274,7 +274,7 @@ GIT_EXTERN(void) git_config_free(git_config *cfg); * @param name the variable's name * @return 0 or an error code */ -GIT_EXTERN(int) git_config_get_config_entry(const git_config_entry **out, git_config *cfg, const char *name); +GIT_EXTERN(int) git_config_get_entry(const git_config_entry **out, git_config *cfg, const char *name); /** * Get the value of an integer config variable. diff --git a/src/config.c b/src/config.c index 9945aaed7..ed9901bd2 100644 --- a/src/config.c +++ b/src/config.c @@ -435,7 +435,7 @@ int git_config_get_string(const char **out, git_config *cfg, const char *name) return GIT_ENOTFOUND; } -int git_config_get_config_entry(const git_config_entry **out, git_config *cfg, const char *name) +int git_config_get_entry(const git_config_entry **out, git_config *cfg, const char *name) { file_internal *internal; unsigned int i; diff --git a/tests-clar/config/read.c b/tests-clar/config/read.c index cf781e6bf..10ae0a4fb 100644 --- a/tests-clar/config/read.c +++ b/tests-clar/config/read.c @@ -305,7 +305,7 @@ void test_config_read__read_git_config_entry(void) cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config9"), GIT_CONFIG_LEVEL_SYSTEM, 0)); - cl_git_pass(git_config_get_config_entry(&entry, cfg, "core.dummy2")); + cl_git_pass(git_config_get_entry(&entry, cfg, "core.dummy2")); cl_assert_equal_s("core.dummy2", entry->name); cl_assert_equal_s("42", entry->value); cl_assert_equal_i(GIT_CONFIG_LEVEL_SYSTEM, entry->level);