X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=sha1_file.c;h=64eac592bbf191b2c97ccf8739fdb0d4712d7788;hb=7c3693f1f240e17772c864fad35bc16226038fc8;hp=776697755a02b98c04fa7831077bd0205a1feb80;hpb=b30245c8e92ecaf8fb877189d7620a5a9a205120;p=git.git

diff --git a/sha1_file.c b/sha1_file.c
index 77669775..64eac592 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -283,7 +283,10 @@ void prepare_alt_odb(void)
 	char *map;
 	int fd;
 	struct stat st;
-	char *alt = gitenv(ALTERNATE_DB_ENVIRONMENT) ? : "";
+	char *alt;
+
+	alt = gitenv(ALTERNATE_DB_ENVIRONMENT);
+	if (!alt) alt = "";
 
 	sprintf(path, "%s/info/alternates", get_object_directory());
 	if (alt_odb_tail)
@@ -484,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;