Module Name: src
Committed By: christos
Date: Fri Apr 26 01:51:55 UTC 2019
Modified Files:
src/crypto/external/bsd/openssh/dist: packet.c packet.h
Log Message:
attribute police
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/packet.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/packet.c
diff -u src/crypto/external/bsd/openssh/dist/packet.c:1.37 src/crypto/external/bsd/openssh/dist/packet.c:1.38
--- src/crypto/external/bsd/openssh/dist/packet.c:1.37 Sat Apr 20 13:16:40 2019
+++ src/crypto/external/bsd/openssh/dist/packet.c Thu Apr 25 21:51:55 2019
@@ -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 <[email protected]>
@@ -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
/*
* 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, co
}
}
-void
+void __attribute__((__format__ (__printf__, 3, 4)))
+__attribute__((__noreturn__))
sshpkt_fatal(struct ssh *ssh, int r, const char *fmt, ...)
{
va_list ap;
Index: src/crypto/external/bsd/openssh/dist/packet.h
diff -u src/crypto/external/bsd/openssh/dist/packet.h:1.19 src/crypto/external/bsd/openssh/dist/packet.h:1.20
--- src/crypto/external/bsd/openssh/dist/packet.h:1.19 Sat Apr 20 13:16:40 2019
+++ src/crypto/external/bsd/openssh/dist/packet.h Thu Apr 25 21:51:55 2019
@@ -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 *,
__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);
