Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssh/dist Use __dead.
details: https://anonhg.NetBSD.org/src/rev/999e30a896fe
branches: trunk
changeset: 807480:999e30a896fe
user: joerg <joerg%NetBSD.org@localhost>
date: Sat Apr 11 21:14:31 2015 +0000
description:
Use __dead.
diffstat:
crypto/external/bsd/openssh/dist/packet.h | 4 ++--
crypto/external/bsd/openssh/dist/ssh-keygen.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diffs (45 lines):
diff -r eac01e0ca7ee -r 999e30a896fe crypto/external/bsd/openssh/dist/packet.h
--- a/crypto/external/bsd/openssh/dist/packet.h Sat Apr 11 21:14:13 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/packet.h Sat Apr 11 21:14:31 2015 +0000
@@ -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_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);
diff -r eac01e0ca7ee -r 999e30a896fe crypto/external/bsd/openssh/dist/ssh-keygen.c
--- a/crypto/external/bsd/openssh/dist/ssh-keygen.c Sat Apr 11 21:14:13 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh-keygen.c Sat Apr 11 21:14:31 2015 +0000
@@ -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 <ylo%cs.hut.fi@localhost>
@@ -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 @@
#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;
Home |
Main Index |
Thread Index |
Old Index