From: Pierre Habouzit Date: Wed, 23 Aug 2006 10:39:11 +0000 (+0200) Subject: git_dir holds pointers to local strings, hence MUST be const. X-Git-Tag: v1.4.3-rc1~208 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5fba16c500ad5847842876df0418664cddf6e50;p=git.git git_dir holds pointers to local strings, hence MUST be const. Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano --- diff --git a/cache.h b/cache.h index 08d6a9127..304479446 100644 --- a/cache.h +++ b/cache.h @@ -123,7 +123,7 @@ extern int cache_errno; #define INDEX_ENVIRONMENT "GIT_INDEX_FILE" #define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE" -extern char *get_git_dir(void); +extern const char *get_git_dir(void); extern char *get_object_directory(void); extern char *get_refs_directory(void); extern char *get_index_file(void); diff --git a/environment.c b/environment.c index e6bd0033b..5fae9ac30 100644 --- a/environment.c +++ b/environment.c @@ -25,8 +25,9 @@ int zlib_compression_level = Z_DEFAULT_COMPRESSION; int pager_in_use; int pager_use_color = 1; -static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir, - *git_graft_file; +static const char *git_dir; +static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file; + static void setup_git_env(void) { git_dir = getenv(GIT_DIR_ENVIRONMENT); @@ -49,7 +50,7 @@ static void setup_git_env(void) git_graft_file = strdup(git_path("info/grafts")); } -char *get_git_dir(void) +const char *get_git_dir(void) { if (!git_dir) setup_git_env();