X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=af6345820f3f8c533868394059b2d3b189e6b422;hb=198b0fb635ed8a007bac0c16eab112c5e2c7995c;hp=226788a5bbe812ae00335560bce20d57899119b6;hpb=a44c9a5e2e6d4108452f2c64dbd11f74a83745af;p=git.git

diff --git a/cache.h b/cache.h
index 226788a5..af634582 100644
--- a/cache.h
+++ b/cache.h
@@ -17,6 +17,19 @@
 #include SHA1_HEADER
 #include <zlib.h>
 
+#if ZLIB_VERNUM < 0x1200
+#define deflateBound(c,s)  ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
+#endif
+
+#ifdef DT_UNKNOWN
+#define DTYPE(de)	((de)->d_type)
+#else
+#define DT_UNKNOWN	0
+#define DT_DIR		1
+#define DT_REG		2
+#define DTYPE(de)	DT_UNKNOWN
+#endif
+
 /*
  * Basic data structures for the directory cache
  *
@@ -121,7 +134,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 +156,28 @@ 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);
+
+void parse_date(char *date, char *buf, int bufsize);
+void datestamp(char *buf, int bufsize);
+
+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 */