X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=6a7525afc982166430b6277cc756c8911f9b2bdb;hb=5569bf9bbedd63a00780fc5c110e0cfab3aa97b9;hp=aa901d1f4669a6c615a70a924b119ded1fe7f464;hpb=220a0b527bd6ecd30a9d6dfed22195c95e6f445a;p=git.git

diff --git a/cache.h b/cache.h
index aa901d1f..6a7525af 100644
--- a/cache.h
+++ b/cache.h
@@ -32,6 +32,12 @@
 #define DTYPE(de)	DT_UNKNOWN
 #endif
 
+#ifdef __GNUC__
+#define NORETURN __attribute__((__noreturn__))
+#else
+#define NORETURN
+#endif
+
 /*
  * Environment variables transition.
  * We accept older names for now but warn.
@@ -111,6 +117,7 @@ extern unsigned int active_nr, active_alloc, active_cache_changed;
 #define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
 
 extern char *get_object_directory(void);
+extern char *get_refs_directory(void);
 extern char *get_index_file(void);
 
 #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
@@ -160,7 +167,7 @@ extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, uns
 extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size);
 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);
+extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
 
 /* Read a tree into the cache */
 extern int read_tree(void *buffer, unsigned long size, int stage);
@@ -175,8 +182,8 @@ 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 die(const char *err, ...);
+extern void usage(const char *err) NORETURN;
+extern void die(const char *err, ...) NORETURN;
 extern int error(const char *err, ...);
 
 extern int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);