@matheusbsbs / matheus-bagliano / commits / c5fba16c50
Fork 0

git_dir holds pointers to local strings, hence MUST be const.

Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Pierre Habouzit committed Aug 23, 2006 at 12:39 UTC c5fba16c500ad5847842876df0418664cddf6e50
2 files changed +5 -4
cache.h
+1 -1
@@ -123,7 +123,7 @@ extern int cache_errno;
123 #define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
124 #define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE"
125
126 -extern char *get_git_dir(void);
126 +extern const char *get_git_dir(void);
127 extern char *get_object_directory(void);
128 extern char *get_refs_directory(void);
129 extern char *get_index_file(void);
environment.c
+4 -3
@@ -25,8 +25,9 @@ int zlib_compression_level = Z_DEFAULT_COMPRESSION;
25 int pager_in_use;
26 int pager_use_color = 1;
27
28 -static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
29 - *git_graft_file;
28 +static const char *git_dir;
29 +static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file;
30 +
31 static void setup_git_env(void)
32 {
33 git_dir = getenv(GIT_DIR_ENVIRONMENT);
@@ -49,7 +50,7 @@ static void setup_git_env(void)
50 git_graft_file = strdup(git_path("info/grafts"));
51 }
52
52 -char *get_git_dir(void)
53 +const char *get_git_dir(void)
54 {
55 if (!git_dir)
56 setup_git_env();