X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=sha1_file.c;h=f4c742eed4736e121448eb8d24697aa812a0d158;hb=e1ccf53a60657930ae7892387736c8b6a91ec610;hp=fa37f1e3ef97c7a35ec9eb4cd71ba7fda5e53055;hpb=8c1f5f0f1f9c36ef5465512753efeff36758ba7d;p=git.git

diff --git a/sha1_file.c b/sha1_file.c
index fa37f1e3..f4c742ee 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -50,22 +50,22 @@ static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
 	*git_graft_file;
 static void setup_git_env(void)
 {
-	git_dir = gitenv(GIT_DIR_ENVIRONMENT);
+	git_dir = getenv(GIT_DIR_ENVIRONMENT);
 	if (!git_dir)
 		git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
-	git_object_dir = gitenv(DB_ENVIRONMENT);
+	git_object_dir = getenv(DB_ENVIRONMENT);
 	if (!git_object_dir) {
 		git_object_dir = xmalloc(strlen(git_dir) + 9);
 		sprintf(git_object_dir, "%s/objects", git_dir);
 	}
 	git_refs_dir = xmalloc(strlen(git_dir) + 6);
 	sprintf(git_refs_dir, "%s/refs", git_dir);
-	git_index_file = gitenv(INDEX_ENVIRONMENT);
+	git_index_file = getenv(INDEX_ENVIRONMENT);
 	if (!git_index_file) {
 		git_index_file = xmalloc(strlen(git_dir) + 7);
 		sprintf(git_index_file, "%s/index", git_dir);
 	}
-	git_graft_file = gitenv(GRAFT_ENVIRONMENT);
+	git_graft_file = getenv(GRAFT_ENVIRONMENT);
 	if (!git_graft_file)
 		git_graft_file = strdup(git_path("info/grafts"));
 }
@@ -285,7 +285,7 @@ void prepare_alt_odb(void)
 	struct stat st;
 	char *alt;
 
-	alt = gitenv(ALTERNATE_DB_ENVIRONMENT);
+	alt = getenv(ALTERNATE_DB_ENVIRONMENT);
 	if (!alt) alt = "";
 
 	sprintf(path, "%s/info/alternates", get_object_directory());
@@ -487,7 +487,7 @@ struct packed_git *parse_pack_index(unsigned char *sha1)
 	return parse_pack_index_file(sha1, path);
 }
 
-struct packed_git *parse_pack_index_file(unsigned char *sha1, char *idx_path)
+struct packed_git *parse_pack_index_file(const unsigned char *sha1, char *idx_path)
 {
 	struct packed_git *p;
 	unsigned long idx_size;