Module Name: src
Committed By: joerg
Date: Sat Apr 11 21:14:31 UTC 2015
Modified Files:
src/crypto/external/bsd/openssh/dist: packet.h ssh-keygen.c
Log Message:
Use __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/packet.h
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
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.h
diff -u src/crypto/external/bsd/openssh/dist/packet.h:1.10 src/crypto/external/bsd/openssh/dist/packet.h:1.11
--- src/crypto/external/bsd/openssh/dist/packet.h:1.10 Fri Apr 3 23:58:19 2015
+++ src/crypto/external/bsd/openssh/dist/packet.h Sat Apr 11 21:14:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: packet.h,v 1.10 2015/04/03 23:58:19 christos Exp $ */
+/* $NetBSD: packet.h,v 1.11 2015/04/11 21:14:31 joerg Exp $ */
/* $OpenBSD: packet.h,v 1.66 2015/01/30 01:13:33 djm Exp $ */
/*
@@ -151,7 +151,7 @@ int sshpkt_sendx(struct ssh *ssh);
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, const char *tag, int r);
+void sshpkt_fatal(struct ssh *ssh, const char *tag, int r) __dead;
int sshpkt_put(struct ssh *ssh, const void *v, size_t len);
int sshpkt_putb(struct ssh *ssh, const struct sshbuf *b);
Index: src/crypto/external/bsd/openssh/dist/ssh-keygen.c
diff -u src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.15 src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.16
--- src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.15 Fri Apr 3 23:58:19 2015
+++ src/crypto/external/bsd/openssh/dist/ssh-keygen.c Sat Apr 11 21:14:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ssh-keygen.c,v 1.15 2015/04/03 23:58:19 christos Exp $ */
+/* $NetBSD: ssh-keygen.c,v 1.16 2015/04/11 21:14:31 joerg Exp $ */
/* $OpenBSD: ssh-keygen.c,v 1.266 2015/02/26 20:45:47 djm Exp $ */
/*
* Author: Tatu Ylonen <[email protected]>
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: ssh-keygen.c,v 1.15 2015/04/03 23:58:19 christos Exp $");
+__RCSID("$NetBSD: ssh-keygen.c,v 1.16 2015/04/11 21:14:31 joerg Exp $");
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
@@ -291,7 +291,7 @@ load_identity(char *filename)
#define SSH_COM_PRIVATE_KEY_MAGIC 0x3f6ff9eb
#ifdef WITH_OPENSSL
-static void
+__dead static void
do_convert_to_ssh2(struct passwd *pw, struct sshkey *k)
{
size_t len;
