summaryrefslogtreecommitdiff
path: root/log.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-13 10:22:54 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-13 10:22:54 +1000
commitf8b7eb7c3c77625845f4e2a844cc57c0496d414e (patch)
tree83bc292ac1cba86c4f7e13d54e321141b530c01f /log.h
parentff4454dbda098d98819a108b76d3508402ab3441 (diff)
- dtucker@cvs.openbsd.org 2008/06/13 00:12:02
[sftp.h log.h] replace __dead with __attribute__((noreturn)), makes things a little easier to port. Also, add it to sigdie(). ok djm@
Diffstat (limited to 'log.h')
-rw-r--r--log.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/log.h b/log.h
index fa0996ad5..650582791 100644
--- a/log.h
+++ b/log.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: log.h,v 1.16 2008/06/10 04:50:25 dtucker Exp $ */ 1/* $OpenBSD: log.h,v 1.17 2008/06/13 00:12:02 dtucker Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -53,9 +53,11 @@ const char * log_facility_name(SyslogFacility);
53LogLevel log_level_number(char *); 53LogLevel log_level_number(char *);
54const char * log_level_name(LogLevel); 54const char * log_level_name(LogLevel);
55 55
56void fatal(const char *, ...) __dead __attribute__((format(printf, 1, 2))); 56void fatal(const char *, ...) __attribute__((noreturn))
57 __attribute__((format(printf, 1, 2)));
57void error(const char *, ...) __attribute__((format(printf, 1, 2))); 58void error(const char *, ...) __attribute__((format(printf, 1, 2)));
58void sigdie(const char *, ...) __attribute__((format(printf, 1, 2))); 59void sigdie(const char *, ...) __attribute__((noreturn))
60 __attribute__((format(printf, 1, 2)));
59void logit(const char *, ...) __attribute__((format(printf, 1, 2))); 61void logit(const char *, ...) __attribute__((format(printf, 1, 2)));
60void verbose(const char *, ...) __attribute__((format(printf, 1, 2))); 62void verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
61void debug(const char *, ...) __attribute__((format(printf, 1, 2))); 63void debug(const char *, ...) __attribute__((format(printf, 1, 2)));
@@ -63,5 +65,5 @@ void debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
63void debug3(const char *, ...) __attribute__((format(printf, 1, 2))); 65void debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
64 66
65void do_log(LogLevel, const char *, va_list); 67void do_log(LogLevel, const char *, va_list);
66void cleanup_exit(int) __dead; 68void cleanup_exit(int) __attribute__((noreturn));
67#endif 69#endif