[PATCH] Warning fix for gcc 4

diff --git a/sha1_file.c b/sha1_file.c
index df5eb2ac670e2969fcb611148929fef68e3747cc..8d189d4919f83c243c306973285cefb5b55e2f19 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -46,21 +46,6 @@ int get_sha1_hex(const char *hex, unsigned char *sha1)
        return 0;
 }
 
-static int get_sha1_file(const char *path, unsigned char *result)
-{
-       char buffer[60];
-       int fd = open(path, O_RDONLY);
-       int len;
-
-       if (fd < 0)
-               return -1;
-       len = read(fd, buffer, sizeof(buffer));
-       close(fd);
-       if (len < 40)
-               return -1;
-       return get_sha1_hex(buffer, result);
-}
-
 static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
        *git_graft_file;
 static void setup_git_env(void)
@@ -132,30 +117,6 @@ int safe_create_leading_directories(char *path)
        return 0;
 }
 
-int get_sha1(const char *str, unsigned char *sha1)
-{
-       static const char *prefix[] = {
-               "",
-               "refs",
-               "refs/tags",
-               "refs/heads",
-               "refs/snap",
-               NULL
-       };
-       const char **p;
-
-       if (!get_sha1_hex(str, sha1))
-               return 0;
-
-       for (p = prefix; *p; p++) {
-               char * pathname = git_path("%s/%s", *p, str);
-               if (!get_sha1_file(pathname, sha1))
-                       return 0;
-       }
-
-       return -1;
-}
-
 char * sha1_to_hex(const unsigned char *sha1)
 {
        static char buffer[50];
@@ -1204,6 +1165,7 @@ void *read_object_with_reference(const unsigned char *sha1,
                        free(buffer);
                        return NULL;
                }
+               free(buffer);
                /* Now we have the ID of the referred-to object in
                 * actual_sha1.  Check again. */
        }
@@ -1335,8 +1297,11 @@ int write_sha1_to_fd(int fd, const unsigned char *sha1)
        ssize_t size;
        unsigned long objsize;
        int posn = 0;
-       void *buf = map_sha1_file_internal(sha1, &objsize);
+       void *map = map_sha1_file_internal(sha1, &objsize);
+       void *buf = map;
+       void *temp_obj = NULL;
        z_stream stream;
+
        if (!buf) {
                unsigned char *unpacked;
                unsigned long len;
@@ -1352,7 +1317,7 @@ int write_sha1_to_fd(int fd, const unsigned char *sha1)
                memset(&stream, 0, sizeof(stream));
                deflateInit(&stream, Z_BEST_COMPRESSION);
                size = deflateBound(&stream, len + hdrlen);
-               buf = xmalloc(size);
+               temp_obj = buf = xmalloc(size);
 
                /* Compress it */
                stream.next_out = buf;
@@ -1370,6 +1335,7 @@ int write_sha1_to_fd(int fd, const unsigned char *sha1)
                while (deflate(&stream, Z_FINISH) == Z_OK)
                        /* nothing */;
                deflateEnd(&stream);
+               free(unpacked);
                
                objsize = stream.total_out;
        }
@@ -1386,6 +1352,12 @@ int write_sha1_to_fd(int fd, const unsigned char *sha1)
                }
                posn += size;
        } while (posn < objsize);
+
+       if (map)
+               munmap(map, objsize);
+       if (temp_obj)
+               free(temp_obj);
+
        return 0;
 }
 
@@ -1416,7 +1388,7 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd, char *buffer,
                ssize_t size;
                if (*bufposn) {
                        stream.avail_in = *bufposn;
-                       stream.next_in = buffer;
+                       stream.next_in = (unsigned char *) buffer;
                        do {
                                stream.next_out = discard;
                                stream.avail_out = sizeof(discard);