From f8b7eb7c3c77625845f4e2a844cc57c0496d414e Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 13 Jun 2008 10:22:54 +1000 Subject: [PATCH] - 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@ --- ChangeLog | 6 +++++- log.h | 10 ++++++---- sftp.h | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1cb4b892..75f6246ca 100644 --- 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@ @@ -4303,4 +4307,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4993 2008/06/13 00:21:51 dtucker Exp $ +$Id: ChangeLog,v 1.4994 2008/06/13 00:22:54 dtucker Exp $ diff --git a/log.h b/log.h index fa0996ad5..650582791 100644 --- 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 @@ -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 b101b95a0..2bde8bb7f 100644 --- 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));