diff options
| author | christos <christos@NetBSD.org> | 2019-04-26 01:51:55 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2019-04-26 01:51:55 +0000 |
| commit | 10f1e65e31e47ad99191afcddca80264d443b709 (patch) | |
| tree | 1393199e2f5f90ff9f4b9fe927b2795ef25c10c6 /crypto | |
| parent | 6f19fe01af472f293286e11709beed7794ab586b (diff) | |
attribute police
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/external/bsd/openssh/dist/packet.c | 12 | ||||
| -rw-r--r-- | crypto/external/bsd/openssh/dist/packet.h | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/crypto/external/bsd/openssh/dist/packet.c b/crypto/external/bsd/openssh/dist/packet.c index c3733b0a829..4feac60d0b6 100644 --- a/crypto/external/bsd/openssh/dist/packet.c +++ b/crypto/external/bsd/openssh/dist/packet.c @@ -1,4 +1,4 @@ -/* $NetBSD: packet.c,v 1.37 2019/04/20 17:16:40 christos Exp $ */ +/* $NetBSD: packet.c,v 1.38 2019/04/26 01:51:55 christos Exp $ */ /* $OpenBSD: packet.c,v 1.283 2019/03/01 03:29:32 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -39,7 +39,7 @@ */ #include "includes.h" -__RCSID("$NetBSD: packet.c,v 1.37 2019/04/20 17:16:40 christos Exp $"); +__RCSID("$NetBSD: packet.c,v 1.38 2019/04/26 01:51:55 christos Exp $"); #include <sys/param.h> /* MIN roundup */ #include <sys/types.h> @@ -1767,7 +1767,7 @@ ssh_packet_remaining(struct ssh *ssh) * authentication problems. The length of the formatted message must not * exceed 1024 bytes. This will automatically call ssh_packet_write_wait. */ -void +void __attribute__((__format__ (__printf__, 2, 3))) ssh_packet_send_debug(struct ssh *ssh, const char *fmt,...) { char buf[1024]; @@ -1804,7 +1804,8 @@ sshpkt_fmt_connection_id(struct ssh *ssh, char *s, size_t l) /* * Pretty-print connection-terminating errors and exit. */ -static void +static void __attribute__((__format__ (__printf__, 3, 0))) +__attribute__((__noreturn__)) sshpkt_vfatal(struct ssh *ssh, int r, const char *fmt, va_list ap) { char *tag = NULL, remote_id[512]; @@ -1854,7 +1855,8 @@ sshpkt_vfatal(struct ssh *ssh, int r, const char *fmt, va_list ap) } } -void +void __attribute__((__format__ (__printf__, 3, 4))) +__attribute__((__noreturn__)) sshpkt_fatal(struct ssh *ssh, int r, const char *fmt, ...) { va_list ap; diff --git a/crypto/external/bsd/openssh/dist/packet.h b/crypto/external/bsd/openssh/dist/packet.h index a346e62cf03..9ac40a3e81c 100644 --- a/crypto/external/bsd/openssh/dist/packet.h +++ b/crypto/external/bsd/openssh/dist/packet.h @@ -1,4 +1,4 @@ -/* $NetBSD: packet.h,v 1.19 2019/04/20 17:16:40 christos Exp $ */ +/* $NetBSD: packet.h,v 1.20 2019/04/26 01:51:55 christos Exp $ */ /* $OpenBSD: packet.h,v 1.90 2019/01/21 10:35:09 djm Exp $ */ /* @@ -167,7 +167,7 @@ int sshpkt_disconnect(struct ssh *, const char *fmt, ...) __attribute__((format(printf, 2, 3))); int sshpkt_add_padding(struct ssh *, u_char); void sshpkt_fatal(struct ssh *ssh, int r, const char *fmt, ...) - __attribute__((format(printf, 3, 4))); + __attribute__((format(printf, 3, 4))) __attribute__((__noreturn__)); int sshpkt_msg_ignore(struct ssh *, u_int); int sshpkt_put(struct ssh *ssh, const void *v, size_t len); |
