Skip to content

Commit c5fba16

Browse files
MadCoderJunio C Hamano
authored andcommitted
git_dir holds pointers to local strings, hence MUST be const.
Signed-off-by: Pierre Habouzit <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 60b7f38 commit c5fba16

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ extern int cache_errno;
123123
#define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
124124
#define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE"
125125

126-
extern char *get_git_dir(void);
126+
extern const char *get_git_dir(void);
127127
extern char *get_object_directory(void);
128128
extern char *get_refs_directory(void);
129129
extern char *get_index_file(void);

environment.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ int zlib_compression_level = Z_DEFAULT_COMPRESSION;
2525
int pager_in_use;
2626
int pager_use_color = 1;
2727

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+
3031
static void setup_git_env(void)
3132
{
3233
git_dir = getenv(GIT_DIR_ENVIRONMENT);
@@ -49,7 +50,7 @@ static void setup_git_env(void)
4950
git_graft_file = strdup(git_path("info/grafts"));
5051
}
5152

52-
char *get_git_dir(void)
53+
const char *get_git_dir(void)
5354
{
5455
if (!git_dir)
5556
setup_git_env();

0 commit comments

Comments
 (0)