RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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@
This commit is contained in:
Darren Tucker 2008-06-13 10:22:54 +10:00
parent ff4454dbda
commit f8b7eb7c3c
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -139,6 +139,10 @@
- ian@cvs.openbsd.org 2008/06/12 23:24:58 - ian@cvs.openbsd.org 2008/06/12 23:24:58
[sshconnect.c] [sshconnect.c]
tweak wording in message, ok deraadt@ jmc@ 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 - (dtucker) [clientloop.c serverloop.c] channel_register_filter now
takes 2 more args. with djm@ takes 2 more args. with djm@
@ -4303,4 +4307,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ 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 $

10
log.h
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -53,9 +53,11 @@ const char * log_facility_name(SyslogFacility);
LogLevel log_level_number(char *); LogLevel log_level_number(char *);
const char * log_level_name(LogLevel); 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 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 logit(const char *, ...) __attribute__((format(printf, 1, 2)));
void verbose(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))); 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 debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
void do_log(LogLevel, const char *, va_list); void do_log(LogLevel, const char *, va_list);
void cleanup_exit(int) __dead; void cleanup_exit(int) __attribute__((noreturn));
#endif #endif

4
sftp.h
View File

@ -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. * Copyright (c) 2001 Markus Friedl. All rights reserved.
@ -98,4 +98,4 @@
struct passwd; struct passwd;
int sftp_server_main(int, char **, 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));