- 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@

diff --git a/ChangeLog b/ChangeLog
index e87bdbfa2b8ec8b35aebe4ad40fb49b43d1c84a4..5bcd79c8e2af1813b28a81659efd5ea0f6981a2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -139,6 +139,10 @@
    - ian@cvs.openbsd.org 2008/06/12 23:24:58
      [sshconnect.c]
      tweak wording in message, ok deraadt@ jmc@
+   - 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@
   - (dtucker) [clientloop.c serverloop.c]  channel_register_filter now
     takes 2 more args.  with djm@
 

diff --git a/log.h b/log.h
index fa0996ad59d4fcd863205c855672aee7296a98f7..650582791113b2d72e48faeda6353238a6d29707 100644 (file)
--- a/log.h
+++ b/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.16 2008/06/10 04:50:25 dtucker Exp $ */
+/* $OpenBSD: log.h,v 1.17 2008/06/13 00:12:02 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -53,9 +53,11 @@ const char *         log_facility_name(SyslogFacility);
 LogLevel       log_level_number(char *);
 const char *   log_level_name(LogLevel);
 
-void     fatal(const char *, ...) __dead __attribute__((format(printf, 1, 2)));
+void     fatal(const char *, ...) __attribute__((noreturn))
+    __attribute__((format(printf, 1, 2)));
 void     error(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     sigdie(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     sigdie(const char *, ...)  __attribute__((noreturn))
+    __attribute__((format(printf, 1, 2)));
 void     logit(const char *, ...) __attribute__((format(printf, 1, 2)));
 void     verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
 void     debug(const char *, ...) __attribute__((format(printf, 1, 2)));
@@ -63,5 +65,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) __dead;
+void    cleanup_exit(int) __attribute__((noreturn));
 #endif

diff --git a/sftp.h b/sftp.h
index b101b95a03c4b2c669877fa705e532227c6e81c5..2bde8bb7ff0aa36f4362b5e28ecda49a332abcea 100644 (file)
--- a/sftp.h
+++ b/sftp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.h,v 1.8 2008/04/18 12:32:11 djm Exp $ */
+/* $OpenBSD: sftp.h,v 1.9 2008/06/13 00:12:02 dtucker Exp $ */
 
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -98,4 +98,4 @@
 struct passwd;
 
 int    sftp_server_main(int, char **, struct passwd *);
-void   sftp_server_cleanup_exit(int) __dead;
+void   sftp_server_cleanup_exit(int) __attribute__((noreturn));