Use new HASHMAP_INIT macro to simplify hashmap initialization

[thirdparty/git.git] / config.h

diff --git a/config.h b/config.h
index 060874488f413cd6453e1633cd69c971d6e5d613..91cdfbfb414fdcc7835a3a467ea680b5780a74c8 100644 (file)
--- a/config.h
+++ b/config.h
@@ -458,8 +458,8 @@ void git_configset_clear(struct config_set *cs);
  */
 int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
 
-int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest);
 int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
+int git_configset_get_string_tmp(struct config_set *cs, const char *key, const char **dest);
 int git_configset_get_int(struct config_set *cs, const char *key, int *dest);
 int git_configset_get_ulong(struct config_set *cs, const char *key, unsigned long *dest);
 int git_configset_get_bool(struct config_set *cs, const char *key, int *dest);
@@ -474,10 +474,10 @@ int repo_config_get_value(struct repository *repo,
                          const char *key, const char **value);
 const struct string_list *repo_config_get_value_multi(struct repository *repo,
                                                      const char *key);
-int repo_config_get_string_const(struct repository *repo,
-                                const char *key, const char **dest);
 int repo_config_get_string(struct repository *repo,
                           const char *key, char **dest);
+int repo_config_get_string_tmp(struct repository *repo,
+                              const char *key, const char **dest);
 int repo_config_get_int(struct repository *repo,
                        const char *key, int *dest);
 int repo_config_get_ulong(struct repository *repo,
@@ -529,13 +529,14 @@ void git_config_clear(void);
  * error message and returns -1. When the configuration variable `key` is
  * not found, returns 1 without touching `dest`.
  */
-int git_config_get_string_const(const char *key, const char **dest);
+int git_config_get_string(const char *key, char **dest);
 
 /**
- * Similar to `git_config_get_string_const`, except that retrieved value
- * copied into the `dest` parameter is a mutable string.
+ * Similar to `git_config_get_string`, but does not allocate any new
+ * memory; on success `dest` will point to memory owned by the config
+ * machinery, which could be invalidated if it is discarded and reloaded.
  */
-int git_config_get_string(const char *key, char **dest);
+int git_config_get_string_tmp(const char *key, const char **dest);
 
 /**
  * Finds and parses the value to an integer for the configuration variable