[PATCH] Makefile: The big git command renaming fallout fix.

diff --git a/cache.h b/cache.h
index 226788a5bbe812ae00335560bce20d57899119b6..aca98f3ec655e0b3530b0f84b5226a51879da95a 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -121,7 +121,7 @@ extern int write_sha1_buffer(const unsigned char *sha1, void *buf, unsigned int
 extern void * map_sha1_file(const unsigned char *sha1, unsigned long *size);
 extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned long *size);
 extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size);
-extern int write_sha1_file(char *buf, unsigned len, const char *type, unsigned char *return_sha1);
+extern int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned char *return_sha1);
 
 extern int check_sha1_signature(unsigned char *sha1, void *buf, unsigned long size, const char *type);
 
@@ -143,8 +143,25 @@ extern int error(const char *err, ...);
 
 extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);
 
-extern void *read_tree_with_tree_or_commit_sha1(const unsigned char *sha1,
-                                               unsigned long *size,
-                                               unsigned char *tree_sha1_ret);
+extern void *read_object_with_reference(const unsigned char *sha1,
+                                       const unsigned char *required_type,
+                                       unsigned long *size,
+                                       unsigned char *sha1_ret);
+
+static inline void *xmalloc(int size)
+{
+       void *ret = malloc(size);
+       if (!ret)
+               die("Out of memory, malloc failed");
+       return ret;
+}
+
+static inline void *xrealloc(void *ptr, int size)
+{
+       void *ret = realloc(ptr, size);
+       if (!ret)
+               die("Out of memory, realloc failed");
+       return ret;
+}
 
 #endif /* CACHE_H */