projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make 'fsck' able to take an arbitrary number of parents on the
[git.git]
/
cache.h
diff --git
a/cache.h
b/cache.h
index
0038e8b
..
35b26c7
100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-64,7
+64,7
@@
struct cache_entry **active_cache;
unsigned int active_nr, active_alloc;
#define DB_ENVIRONMENT "SHA1_FILE_DIRECTORY"
unsigned int active_nr, active_alloc;
#define DB_ENVIRONMENT "SHA1_FILE_DIRECTORY"
-#define DEFAULT_DB_ENVIRONMENT ".
dircache
/objects"
+#define DEFAULT_DB_ENVIRONMENT ".
git
/objects"
#define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7)
#define ce_size(ce) cache_entry_size((ce)->namelen)
#define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7)
#define ce_size(ce) cache_entry_size((ce)->namelen)
@@
-73,7
+73,10
@@
unsigned int active_nr, active_alloc;
/* Initialize and use the cache information */
extern int read_cache(void);
/* Initialize and use the cache information */
extern int read_cache(void);
+extern int write_cache(int newfd, struct cache_entry **cache, int entries);
extern int cache_name_pos(const char *name, int namelen);
extern int cache_name_pos(const char *name, int namelen);
+extern int add_cache_entry(struct cache_entry *ce, int ok_to_add);
+extern int remove_file_from_cache(char *path);
extern int cache_match_stat(struct cache_entry *ce, struct stat *st);
#define MTIME_CHANGED 0x0001
extern int cache_match_stat(struct cache_entry *ce, struct stat *st);
#define MTIME_CHANGED 0x0001
@@
-84,23
+87,27
@@
extern int cache_match_stat(struct cache_entry *ce, struct stat *st);
#define DATA_CHANGED 0x0020
/* Return a statically allocated filename matching the sha1 signature */
#define DATA_CHANGED 0x0020
/* Return a statically allocated filename matching the sha1 signature */
-extern char *sha1_file_name(unsigned char *sha1);
+extern char *sha1_file_name(
const
unsigned char *sha1);
/* Write a memory buffer out to the sha file */
/* Write a memory buffer out to the sha file */
-extern int write_sha1_buffer(unsigned char *sha1, void *buf, unsigned int size);
+extern int write_sha1_buffer(
const
unsigned char *sha1, void *buf, unsigned int size);
/* Read and unpack a sha1 file into memory, write memory to a sha1 file */
/* Read and unpack a sha1 file into memory, write memory to a sha1 file */
-extern void * map_sha1_file(unsigned char *sha1, unsigned long *size);
+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 * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned long *size);
-extern void * read_sha1_file(unsigned char *sha1, char *type, unsigned long *size);
-extern int write_sha1_file(char *buf, unsigned len);
+extern void * read_sha1_file(
const
unsigned char *sha1, char *type, unsigned long *size);
+extern int write_sha1_file(char *buf, unsigned len
, unsigned char *return_sha1
);
extern int check_sha1_signature(unsigned char *sha1, void *buf, unsigned long size);
/* Convert to/from hex/sha1 representation */
extern int check_sha1_signature(unsigned char *sha1, void *buf, unsigned long size);
/* Convert to/from hex/sha1 representation */
-extern int get_sha1_hex(char *hex, unsigned char *sha1);
-extern char *sha1_to_hex(
unsigned char *sha1); /* static buffer
! */
+extern int get_sha1_hex(c
onst c
har *hex, unsigned char *sha1);
+extern char *sha1_to_hex(
const unsigned char *sha1); /* static buffer result
! */
/* General helper functions */
extern void usage(const char *err);
/* General helper functions */
extern void usage(const char *err);
+extern void die(const char *err, ...);
+extern int error(const char *err, ...);
+
+extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);
#endif /* CACHE_H */
#endif /* CACHE_H */