From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 3 Jul 2005 16:58:44 +0000 (-0700)
Subject: Avoid gcc warnings in sha1_file.c
X-Git-Tag: v0.99~99
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=4d235c8044a638108b67e22f94b2876657130fc8;p=git.git

Avoid gcc warnings in sha1_file.c

A couple of bogus "might be used undefined" warnings are avoided
by moving the initializations unnecessarily early.
---

diff --git a/sha1_file.c b/sha1_file.c
index 49517a41..a4ed4f9c 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -294,6 +294,8 @@ static int check_packed_git_idx(const char *path, unsigned long *idx_size_,
 		return -1;
 
 	index = idx_map;
+	*idx_map_ = idx_map;
+	*idx_size_ = idx_size;
 
 	/* check index map */
 	if (idx_size < 4*256 + 20 + 20)
@@ -316,8 +318,6 @@ static int check_packed_git_idx(const char *path, unsigned long *idx_size_,
 	if (idx_size != 4*256 + nr * 24 + 20 + 20)
 		return error("wrong index file size");
 
-	*idx_map_ = idx_map;
-	*idx_size_ = idx_size;
 	return 0;
 }
 
@@ -857,7 +857,7 @@ static void *unpack_non_delta_entry(unsigned char *data,
 {
 	int st;
 	z_stream stream;
-	char *buffer;
+	unsigned char *buffer;
 
 	buffer = xmalloc(size + 1);
 	buffer[size] = 0;
@@ -949,7 +949,7 @@ int nth_packed_object_sha1(const struct packed_git *p, int n,
 int find_pack_entry_one(const unsigned char *sha1,
 			struct pack_entry *e, struct packed_git *p)
 {
-	int *level1_ofs = p->index_base;
+	unsigned int *level1_ofs = p->index_base;
 	int hi = ntohl(level1_ofs[*sha1]);
 	int lo = ((*sha1 == 0x0) ? 0 : ntohl(level1_ofs[*sha1 - 1]));
 	void *index = p->index_base + 256;