Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

src: Fix clang build by adding __dead annotations.



details:   https://anonhg.NetBSD.org/src/rev/81b9a5ff0487
branches:  trunk
changeset: 317923:81b9a5ff0487
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Apr 08 21:56:48 2018 +0000
description:
Fix clang build by adding __dead annotations.

diffstat:

 crypto/external/bsd/openssh/dist/servconf.c |  6 +++---
 crypto/external/bsd/openssh/dist/sshd.c     |  7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r e49aad4075c8 -r 81b9a5ff0487 crypto/external/bsd/openssh/dist/servconf.c
--- a/crypto/external/bsd/openssh/dist/servconf.c       Sun Apr 08 17:20:18 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/servconf.c       Sun Apr 08 21:56:48 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: servconf.c,v 1.26 2018/04/06 18:59:00 christos Exp $   */
+/*     $NetBSD: servconf.c,v 1.27 2018/04/08 21:56:48 joerg Exp $      */
 
 /* $OpenBSD: servconf.c,v 1.326 2018/03/01 20:32:16 markus Exp $ */
 /*
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: servconf.c,v 1.26 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: servconf.c,v 1.27 2018/04/08 21:56:48 joerg Exp $");
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
@@ -1053,7 +1053,7 @@
        return result;
 }
 
-static void
+__dead static void
 match_test_missing_fatal(const char *criteria, const char *attrib)
 {
        fatal("'Match %s' in configuration but '%s' not in connection "
diff -r e49aad4075c8 -r 81b9a5ff0487 crypto/external/bsd/openssh/dist/sshd.c
--- a/crypto/external/bsd/openssh/dist/sshd.c   Sun Apr 08 17:20:18 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/sshd.c   Sun Apr 08 21:56:48 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sshd.c,v 1.29 2018/04/06 18:59:00 christos Exp $       */
+/*     $NetBSD: sshd.c,v 1.30 2018/04/08 21:56:48 joerg Exp $  */
 /* $OpenBSD: sshd.c,v 1.506 2018/03/03 03:15:51 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -44,7 +44,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: sshd.c,v 1.29 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: sshd.c,v 1.30 2018/04/08 21:56:48 joerg Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -1338,6 +1338,9 @@
 }
 
 /* Set the routing domain for this process */
+#if !defined(__OpenBSD__)
+__dead
+#endif
 static void
 set_process_rdomain(struct ssh *ssh, const char *name)
 {



Home | Main Index | Thread Index | Old Index