summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-22 12:57:44 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-22 12:57:44 +1000
commitefa62f98a140e238256c2f75f4cd8a282fe802a3 (patch)
tree6f6db291ac9fa18abc444452470c8560ea9fedc0
parent723e945b55b29ecd7ce908cf81a67fd998764aff (diff)
- djm@cvs.openbsd.org 2004/06/21 22:02:58
[log.h] mark fatal and cleanup exit as __dead; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--log.h6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c4cf8c35..b1e71302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
- djm@cvs.openbsd.org 2004/06/21 17:53:03
[session.c]
fix fd leak for multiple subsystem connections; with markus@
+ - djm@cvs.openbsd.org 2004/06/21 22:02:58
+ [log.h]
+ mark fatal and cleanup exit as __dead; ok markus@
20040620
- (tim) [configure.ac Makefile.in] Only change TEST_SHELL on broken platforms.
@@ -1343,4 +1346,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3422 2004/06/22 02:57:08 dtucker Exp $
+$Id: ChangeLog,v 1.3423 2004/06/22 02:57:44 dtucker Exp $
diff --git a/log.h b/log.h
index e0263194..2b3c3090 100644
--- a/log.h
+++ b/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.10 2003/09/23 20:17:11 markus Exp $ */
+/* $OpenBSD: log.h,v 1.11 2004/06/21 22:02:58 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -53,7 +53,7 @@ void log_init(char *, LogLevel, SyslogFacility, int);
SyslogFacility log_facility_number(char *);
LogLevel log_level_number(char *);
-void fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
+void fatal(const char *, ...) __dead __attribute__((format(printf, 1, 2)));
void error(const char *, ...) __attribute__((format(printf, 1, 2)));
void logit(const char *, ...) __attribute__((format(printf, 1, 2)));
void verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
@@ -62,5 +62,5 @@ void debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
void debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
void do_log(LogLevel, const char *, va_list);
-void cleanup_exit(int);
+void cleanup_exit(int) __dead;
#endif