undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Pierre Habouzit 2006-08-23 12:39:11 +02:00 committed by Junio C Hamano
parent 60b7f38e0e
commit c5fba16c50
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.h
View File

@ -123,7 +123,7 @@ extern int cache_errno;
#define INDEX_ENVIRONMENT "GIT_INDEX_FILE" #define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
#define GRAFT_ENVIRONMENT "GIT_GRAFT_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_object_directory(void);
extern char *get_refs_directory(void); extern char *get_refs_directory(void);
extern char *get_index_file(void); extern char *get_index_file(void);

7
environment.c
View File

@ -25,8 +25,9 @@ int zlib_compression_level = Z_DEFAULT_COMPRESSION;
int pager_in_use; int pager_in_use;
int pager_use_color = 1; int pager_use_color = 1;
static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir, static const char *git_dir;
*git_graft_file; static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file;
static void setup_git_env(void) static void setup_git_env(void)
{ {
git_dir = getenv(GIT_DIR_ENVIRONMENT); git_dir = getenv(GIT_DIR_ENVIRONMENT);
@ -49,7 +50,7 @@ static void setup_git_env(void)
git_graft_file = strdup(git_path("info/grafts")); git_graft_file = strdup(git_path("info/grafts"));
} }
char *get_git_dir(void) const char *get_git_dir(void)
{ {
if (!git_dir) if (!git_dir)
setup_git_env(); setup_git_env();