Here is a few trivial fixes to git about things that gcc4 complains about.
Signed-off-by: Mika Kukkonen <mikukkon@iki.fi>
diffstat:
git/send-pack.c | 2 +-
git/sha1_file.c | 4 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
Show changes to diff +5 −5
Index: git/send-pack.c
===================================================================
--- git.orig/send-pack.c
+++ git/send-pack.c
@@ -93,7 +93,7 @@ static void rev_list(int fd, struct ref
exec_rev_list(refs);
}
-static int pack_objects(int fd, struct ref *refs)
+static void pack_objects(int fd, struct ref *refs)
{
pid_t rev_list_pid;
Index: git/sha1_file.c
===================================================================
--- git.orig/sha1_file.c
+++ git/sha1_file.c
@@ -384,8 +384,8 @@ struct packed_git *add_packed_git(char *
{
struct stat st;
struct packed_git *p;
- unsigned long idx_size;
- void *idx_map;
+ unsigned long idx_size = 0;
+ void *idx_map = NULL;
if (check_packed_git_idx(path, &idx_size, &idx_map))
return NULL;
@@ -857,7 +857,7 @@ static void *unpack_non_delta_entry(unsi
{
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
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;