X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=cache.h;h=35b26c7d87c04497c84a08a9b29d93f09fcafbe8;hb=bcee6fd8e7164aa7a4170f109af8347d88f0175e;hp=4b101188d7fa074ad0cf5f4ad16eb33a43e87d24;hpb=73134b6d3f700bb9e6c66aa2f099de644c6b8d09;p=git.git diff --git a/cache.h b/cache.h index 4b101188..35b26c7d 100644 --- 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" -#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) @@ -104,7 +104,10 @@ extern int get_sha1_hex(const char *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, ...); +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 */