X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=cache.h;h=858ea7ff0c9b7f8ae585f99ce980ddad9d7e82d6;hb=73848892adeaa421825672bce929b9cc16043fa9;hp=7696766dde0c8bd566a4529d6fa755da32f1482e;hpb=127cfd0d2f1db6ef690e01aafd1c660ea1c82499;p=git.git

diff --git a/cache.h b/cache.h
index 7696766d..858ea7ff 100644
--- a/cache.h
+++ b/cache.h
@@ -40,10 +40,6 @@ extern char *gitenv_bc(const char *);
 
 /*
  * Basic data structures for the directory cache
- *
- * NOTE NOTE NOTE! This is all in the native CPU byte format. It's
- * not even trying to be portable. It's trying to be efficient. It's
- * just a cache, after all.
  */
 
 #define CACHE_SIGNATURE 0x44495243	/* "DIRC" */
@@ -126,10 +122,10 @@ extern int cache_name_pos(const char *name, int namelen);
 #define ADD_CACHE_OK_TO_ADD 1		/* Ok to add */
 #define ADD_CACHE_OK_TO_REPLACE 2	/* Ok to replace file/directory */
 extern int add_cache_entry(struct cache_entry *ce, int option);
-extern int remove_entry_at(int pos);
+extern int remove_cache_entry_at(int pos);
 extern int remove_file_from_cache(char *path);
-extern int same_name(struct cache_entry *a, struct cache_entry *b);
-extern int cache_match_stat(struct cache_entry *ce, struct stat *st);
+extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
+extern int ce_match_stat(struct cache_entry *ce, struct stat *st);
 extern int index_fd(unsigned char *sha1, int fd, struct stat *st);
 
 #define MTIME_CHANGED	0x0001
@@ -147,7 +143,7 @@ extern char *sha1_file_name(const unsigned char *sha1);
 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 long len, const char *type, unsigned char *return_sha1);
+extern int write_sha1_file(void *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);
 
@@ -171,7 +167,7 @@ extern int error(const char *err, ...);
 extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);
 
 extern void *read_object_with_reference(const unsigned char *sha1,
-					const unsigned char *required_type,
+					const char *required_type,
 					unsigned long *size,
 					unsigned char *sha1_ret);