configuration: cvar -> configmap

`cvar` is an unhelpful name.  Refactor its usage to `configmap` for more
clarity.

1 files changed, 38 insertions, 38 deletions

diff --git a/src/config_cache.c b/src/config_cache.c
index 2530217c9..dbc463bcf 100644
--- a/src/config_cache.c
+++ b/src/config_cache.c
@@ -15,8 +15,8 @@
 #include "filter.h"
 
 struct map_data {
-	const char *cvar_name;
-	git_cvar_map *maps;
+	const char *name;
+	git_configmap *maps;
 	size_t map_count;
 	int default_value;
 };
@@ -29,11 +29,11 @@ struct map_data {
  *	value is native. See gitattributes(5) for more information on
  *	end-of-line conversion.
  */
-static git_cvar_map _cvar_map_eol[] = {
-	{GIT_CVAR_FALSE, NULL, GIT_EOL_UNSET},
-	{GIT_CVAR_STRING, "lf", GIT_EOL_LF},
-	{GIT_CVAR_STRING, "crlf", GIT_EOL_CRLF},
-	{GIT_CVAR_STRING, "native", GIT_EOL_NATIVE}
+static git_configmap _configmap_eol[] = {
+	{GIT_CONFIGMAP_FALSE, NULL, GIT_EOL_UNSET},
+	{GIT_CONFIGMAP_STRING, "lf", GIT_EOL_LF},
+	{GIT_CONFIGMAP_STRING, "crlf", GIT_EOL_CRLF},
+	{GIT_CONFIGMAP_STRING, "native", GIT_EOL_NATIVE}
 };
 
 /*
@@ -46,55 +46,55 @@ static git_cvar_map _cvar_map_eol[] = {
  *	does not have normalized line endings. This variable can be set to input,
  *	in which case no output conversion is performed.
  */
-static git_cvar_map _cvar_map_autocrlf[] = {
-	{GIT_CVAR_FALSE, NULL, GIT_AUTO_CRLF_FALSE},
-	{GIT_CVAR_TRUE, NULL, GIT_AUTO_CRLF_TRUE},
-	{GIT_CVAR_STRING, "input", GIT_AUTO_CRLF_INPUT}
+static git_configmap _configmap_autocrlf[] = {
+	{GIT_CONFIGMAP_FALSE, NULL, GIT_AUTO_CRLF_FALSE},
+	{GIT_CONFIGMAP_TRUE, NULL, GIT_AUTO_CRLF_TRUE},
+	{GIT_CONFIGMAP_STRING, "input", GIT_AUTO_CRLF_INPUT}
 };
 
-static git_cvar_map _cvar_map_safecrlf[] = {
-	{GIT_CVAR_FALSE, NULL, GIT_SAFE_CRLF_FALSE},
-	{GIT_CVAR_TRUE, NULL, GIT_SAFE_CRLF_FAIL},
-	{GIT_CVAR_STRING, "warn", GIT_SAFE_CRLF_WARN}
+static git_configmap _configmap_safecrlf[] = {
+	{GIT_CONFIGMAP_FALSE, NULL, GIT_SAFE_CRLF_FALSE},
+	{GIT_CONFIGMAP_TRUE, NULL, GIT_SAFE_CRLF_FAIL},
+	{GIT_CONFIGMAP_STRING, "warn", GIT_SAFE_CRLF_WARN}
 };
 
-static git_cvar_map _cvar_map_logallrefupdates[] = {
-	{GIT_CVAR_FALSE, NULL, GIT_LOGALLREFUPDATES_FALSE},
-	{GIT_CVAR_TRUE, NULL, GIT_LOGALLREFUPDATES_TRUE},
-	{GIT_CVAR_STRING, "always", GIT_LOGALLREFUPDATES_ALWAYS},
+static git_configmap _configmap_logallrefupdates[] = {
+	{GIT_CONFIGMAP_FALSE, NULL, GIT_LOGALLREFUPDATES_FALSE},
+	{GIT_CONFIGMAP_TRUE, NULL, GIT_LOGALLREFUPDATES_TRUE},
+	{GIT_CONFIGMAP_STRING, "always", GIT_LOGALLREFUPDATES_ALWAYS},
 };
 
 /*
  * Generic map for integer values
  */
-static git_cvar_map _cvar_map_int[] = {
-	{GIT_CVAR_INT32, NULL, 0},
+static git_configmap _configmap_int[] = {
+	{GIT_CONFIGMAP_INT32, NULL, 0},
 };
 
-static struct map_data _cvar_maps[] = {
-	{"core.autocrlf", _cvar_map_autocrlf, ARRAY_SIZE(_cvar_map_autocrlf), GIT_AUTO_CRLF_DEFAULT},
-	{"core.eol", _cvar_map_eol, ARRAY_SIZE(_cvar_map_eol), GIT_EOL_DEFAULT},
+static struct map_data _configmaps[] = {
+	{"core.autocrlf", _configmap_autocrlf, ARRAY_SIZE(_configmap_autocrlf), GIT_AUTO_CRLF_DEFAULT},
+	{"core.eol", _configmap_eol, ARRAY_SIZE(_configmap_eol), GIT_EOL_DEFAULT},
 	{"core.symlinks", NULL, 0, GIT_SYMLINKS_DEFAULT },
 	{"core.ignorecase", NULL, 0, GIT_IGNORECASE_DEFAULT },
 	{"core.filemode", NULL, 0, GIT_FILEMODE_DEFAULT },
 	{"core.ignorestat", NULL, 0, GIT_IGNORESTAT_DEFAULT },
 	{"core.trustctime", NULL, 0, GIT_TRUSTCTIME_DEFAULT },
-	{"core.abbrev", _cvar_map_int, 1, GIT_ABBREV_DEFAULT },
+	{"core.abbrev", _configmap_int, 1, GIT_ABBREV_DEFAULT },
 	{"core.precomposeunicode", NULL, 0, GIT_PRECOMPOSE_DEFAULT },
-	{"core.safecrlf", _cvar_map_safecrlf, ARRAY_SIZE(_cvar_map_safecrlf), GIT_SAFE_CRLF_DEFAULT},
-	{"core.logallrefupdates", _cvar_map_logallrefupdates, ARRAY_SIZE(_cvar_map_logallrefupdates), GIT_LOGALLREFUPDATES_DEFAULT},
+	{"core.safecrlf", _configmap_safecrlf, ARRAY_SIZE(_configmap_safecrlf), GIT_SAFE_CRLF_DEFAULT},
+	{"core.logallrefupdates", _configmap_logallrefupdates, ARRAY_SIZE(_configmap_logallrefupdates), GIT_LOGALLREFUPDATES_DEFAULT},
 	{"core.protecthfs", NULL, 0, GIT_PROTECTHFS_DEFAULT },
 	{"core.protectntfs", NULL, 0, GIT_PROTECTNTFS_DEFAULT },
 	{"core.fsyncobjectfiles", NULL, 0, GIT_FSYNCOBJECTFILES_DEFAULT },
 };
 
-int git_config__cvar(int *out, git_config *config, git_cvar_cached cvar)
+int git_config__configmap_lookup(int *out, git_config *config, git_configmap_item item)
 {
 	int error = 0;
-	struct map_data *data = &_cvar_maps[(int)cvar];
+	struct map_data *data = &_configmaps[(int)item];
 	git_config_entry *entry;
 
-	if ((error = git_config__lookup_entry(&entry, config, data->cvar_name, false)) < 0)
+	if ((error = git_config__lookup_entry(&entry, config, data->name, false)) < 0)
 		return error;
 
 	if (!entry)
@@ -109,29 +109,29 @@ int git_config__cvar(int *out, git_config *config, git_cvar_cached cvar)
 	return error;
 }
 
-int git_repository__cvar(int *out, git_repository *repo, git_cvar_cached cvar)
+int git_repository__configmap_lookup(int *out, git_repository *repo, git_configmap_item item)
 {
-	*out = repo->cvar_cache[(int)cvar];
+	*out = repo->configmap_cache[(int)item];
 
-	if (*out == GIT_CVAR_NOT_CACHED) {
+	if (*out == GIT_CONFIGMAP_NOT_CACHED) {
 		int error;
 		git_config *config;
 
 		if ((error = git_repository_config__weakptr(&config, repo)) < 0 ||
-			(error = git_config__cvar(out, config, cvar)) < 0)
+			(error = git_config__configmap_lookup(out, config, item)) < 0)
 			return error;
 
-		repo->cvar_cache[(int)cvar] = *out;
+		repo->configmap_cache[(int)item] = *out;
 	}
 
 	return 0;
 }
 
-void git_repository__cvar_cache_clear(git_repository *repo)
+void git_repository__configmap_lookup_cache_clear(git_repository *repo)
 {
 	int i;
 
-	for (i = 0; i < GIT_CVAR_CACHE_MAX; ++i)
-		repo->cvar_cache[i] = GIT_CVAR_NOT_CACHED;
+	for (i = 0; i < GIT_CONFIGMAP_CACHE_MAX; ++i)
+		repo->configmap_cache[i] = GIT_CONFIGMAP_NOT_CACHED;
 }