[src/trunk]: src/crypto/external/bsd/openssh/dist attribute police

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72e031e69972
branches:  trunk
changeset: 998660:72e031e69972
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Apr 26 01:51:55 2019 +0000

description:
attribute police

diffstat:

 crypto/external/bsd/openssh/dist/packet.c |  12 +++++++-----
 crypto/external/bsd/openssh/dist/packet.h |   4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (65 lines):

diff -r f17c2eea9a40 -r 72e031e69972 crypto/external/bsd/openssh/dist/packet.c
--- a/crypto/external/bsd/openssh/dist/packet.c Thu Apr 25 23:17:24 2019 +0000
+++ b/crypto/external/bsd/openssh/dist/packet.c Fri Apr 26 01:51:55 2019 +0000
@@ -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@localhost>
@@ -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 @@
  * 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 @@
 /*
  * 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 @@
        }
 }
 
-void
+void __attribute__((__format__ (__printf__, 3, 4)))
+__attribute__((__noreturn__))
 sshpkt_fatal(struct ssh *ssh, int r, const char *fmt, ...)
 {
        va_list ap;
diff -r f17c2eea9a40 -r 72e031e69972 crypto/external/bsd/openssh/dist/packet.h
--- a/crypto/external/bsd/openssh/dist/packet.h Thu Apr 25 23:17:24 2019 +0000
+++ b/crypto/external/bsd/openssh/dist/packet.h Fri Apr 26 01:51:55 2019 +0000
@@ -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 @@
            __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);