summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-06 17:12:31 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-06 17:12:31 (GMT)
commit90334cf780428f1ca68e5f29fb543e3605fb2fc1 (patch)
treeff96101f1480b7a60bb863e95fbbe32bebabc66b
parent64de356299c74d891de5c11385538b7bcbc15bae (diff)
downloadgit-90334cf780428f1ca68e5f29fb543e3605fb2fc1.zip
git-90334cf780428f1ca68e5f29fb543e3605fb2fc1.tar.gz
git-90334cf780428f1ca68e5f29fb543e3605fb2fc1.tar.bz2
Add "__noreturn__" attribute to die() and usage()
Only with gcc. It fixes some warnings for certain versions of gcc, but not apparently all.
-rw-r--r--cache.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index aa901d1..95353a1 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.
@@ -175,8 +181,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);