[src/trunk]: src/crypto/external/bsd/openssh/dist Use __dead.

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

details:   https://anonhg.NetBSD.org/src/rev/606654e9c935
branches:  trunk
changeset: 769622:606654e9c935
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Sep 16 15:36:18 2011 +0000

description:
Use __dead.

diffstat:

 crypto/external/bsd/openssh/dist/auth-pam.c    |   4 +-
 crypto/external/bsd/openssh/dist/monitor.h     |   4 +-
 crypto/external/bsd/openssh/dist/scp.c         |  20 ++++++++--------
 crypto/external/bsd/openssh/dist/session.c     |  11 ++++----
 crypto/external/bsd/openssh/dist/sftp-server.c |   6 ++--
 crypto/external/bsd/openssh/dist/sftp.c        |   8 +++---
 crypto/external/bsd/openssh/dist/ssh-agent.c   |   8 +++---
 crypto/external/bsd/openssh/dist/ssh-keygen.c  |  32 +++++++++++++-------------
 crypto/external/bsd/openssh/dist/ssh-keyscan.c |   8 +++---
 crypto/external/bsd/openssh/dist/sshd.c        |  10 ++++----
 10 files changed, 55 insertions(+), 56 deletions(-)

diffs (truncated from 492 to 300 lines):

diff -r 44bd11f92528 -r 606654e9c935 crypto/external/bsd/openssh/dist/auth-pam.c
--- a/crypto/external/bsd/openssh/dist/auth-pam.c       Fri Sep 16 15:36:00 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-pam.c       Fri Sep 16 15:36:18 2011 +0000
@@ -50,7 +50,7 @@
 /*
  * NetBSD local changes
  */
-__RCSID("$NetBSD: auth-pam.c,v 1.2 2009/12/27 01:40:46 christos Exp $");
+__RCSID("$NetBSD: auth-pam.c,v 1.3 2011/09/16 15:36:18 joerg Exp $");
 #undef USE_POSIX_THREADS /* Not yet */
 #define HAVE_SECURITY_PAM_APPL_H
 #define HAVE_PAM_GETENVLIST
@@ -184,7 +184,7 @@
 }
 
 /* ARGSUSED */
-static void
+__dead static void
 pthread_exit(void *value)
 {
        _exit(0);
diff -r 44bd11f92528 -r 606654e9c935 crypto/external/bsd/openssh/dist/monitor.h
--- a/crypto/external/bsd/openssh/dist/monitor.h        Fri Sep 16 15:36:00 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/monitor.h        Fri Sep 16 15:36:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: monitor.h,v 1.3 2011/09/07 17:49:19 christos Exp $     */
+/*     $NetBSD: monitor.h,v 1.4 2011/09/16 15:36:18 joerg Exp $        */
 /* $OpenBSD: monitor.h,v 1.16 2011/06/17 21:44:31 djm Exp $ */
 
 /*
@@ -88,7 +88,7 @@
 
 struct Authctxt;
 void monitor_child_preauth(struct Authctxt *, struct monitor *);
-void monitor_child_postauth(struct monitor *);
+__dead void monitor_child_postauth(struct monitor *);
 
 struct mon_table;
 int monitor_read(struct monitor*, struct mon_table *, struct mon_table **);
diff -r 44bd11f92528 -r 606654e9c935 crypto/external/bsd/openssh/dist/scp.c
--- a/crypto/external/bsd/openssh/dist/scp.c    Fri Sep 16 15:36:00 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/scp.c    Fri Sep 16 15:36:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scp.c,v 1.5 2011/07/25 03:03:11 christos Exp $ */
+/*     $NetBSD: scp.c,v 1.6 2011/09/16 15:36:18 joerg Exp $    */
 /* $OpenBSD: scp.c,v 1.170 2010/12/09 14:13:33 jmc Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
@@ -73,7 +73,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: scp.c,v 1.5 2011/07/25 03:03:11 christos Exp $");
+__RCSID("$NetBSD: scp.c,v 1.6 2011/09/16 15:36:18 joerg Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/poll.h>
@@ -144,7 +144,7 @@
 /* This is used to store the pid of ssh_program */
 pid_t do_cmd_pid = -1;
 
-static void
+__dead static void
 killchild(int signo)
 {
        if (do_cmd_pid > 1) {
@@ -338,7 +338,7 @@
 } BUF;
 
 BUF *allocbuf(BUF *, int, int);
-void lostconn(int);
+__dead static void lostconn(int);
 int okname(char *);
 void run_err(const char *,...);
 void verifydir(char *);
@@ -355,9 +355,9 @@
 void rsource(char *, struct stat *);
 void sink(int, char *[]);
 void source(int, char *[]);
-void tolocal(int, char *[]);
-void toremote(char *, int, char *[]);
-void usage(void);
+static void tolocal(int, char *[]);
+static void toremote(char *, int, char *[]);
+__dead static void usage(void);
 
 int
 main(int argc, char **argv)
@@ -539,7 +539,7 @@
        return 0;
 }
 
-void
+static void
 toremote(char *targ, int argc, char **argv)
 {
        char *bp, *host, *src, *suser, *thost, *tuser, *arg;
@@ -656,7 +656,7 @@
        xfree(arg);
 }
 
-void
+static void
 tolocal(int argc, char **argv)
 {
        char *bp, *host, *src, *suser;
@@ -1296,7 +1296,7 @@
        return (bp);
 }
 
-void
+static void
 lostconn(int signo)
 {
        if (!iamremote)
diff -r 44bd11f92528 -r 606654e9c935 crypto/external/bsd/openssh/dist/session.c
--- a/crypto/external/bsd/openssh/dist/session.c        Fri Sep 16 15:36:00 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/session.c        Fri Sep 16 15:36:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: session.c,v 1.7 2011/07/25 03:03:11 christos Exp $     */
+/*     $NetBSD: session.c,v 1.8 2011/09/16 15:36:18 joerg Exp $        */
 /* $OpenBSD: session.c,v 1.258 2010/11/25 04:10:09 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: session.c,v 1.7 2011/07/25 03:03:11 christos Exp $");
+__RCSID("$NetBSD: session.c,v 1.8 2011/09/16 15:36:18 joerg Exp $");
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/un.h>
@@ -108,7 +108,7 @@
 int    do_exec_no_pty(Session *, const char *);
 int    do_exec(Session *, const char *);
 void   do_login(Session *, const char *);
-void   do_child(Session *, const char *);
+__dead void    do_child(Session *, const char *);
 void   do_motd(void);
 int    check_quietlogin(Session *, const char *);
 
@@ -1469,7 +1469,7 @@
                fatal("Failed to set uids to %u.", (u_int) pw->pw_uid);
 }
 
-static void
+__dead static void
 do_pwchange(Session *s)
 {
        fflush(NULL);
@@ -1486,7 +1486,7 @@
        exit(1);
 }
 
-static void
+__dead static void
 launch_login(struct passwd *pw, const char *hostname)
 {
        /* Launch login(1). */
@@ -1555,7 +1555,6 @@
                do_setusercontext(pw);
                child_close_fds();
                do_pwchange(s);
-               exit(1);
        }
 
        /* login(1) is only called if we execute the login shell */
diff -r 44bd11f92528 -r 606654e9c935 crypto/external/bsd/openssh/dist/sftp-server.c
--- a/crypto/external/bsd/openssh/dist/sftp-server.c    Fri Sep 16 15:36:00 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/sftp-server.c    Fri Sep 16 15:36:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sftp-server.c,v 1.6 2011/09/07 17:49:19 christos Exp $ */
+/*     $NetBSD: sftp-server.c,v 1.7 2011/09/16 15:36:18 joerg Exp $    */
 /* $OpenBSD: sftp-server.c,v 1.94 2011/06/17 21:46:16 djm Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: sftp-server.c,v 1.6 2011/09/07 17:49:19 christos Exp $");
+__RCSID("$NetBSD: sftp-server.c,v 1.7 2011/09/16 15:36:18 joerg Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -1359,7 +1359,7 @@
        _exit(i);
 }
 
-static void
+__dead static void
 sftp_server_usage(void)
 {
        extern char *__progname;
diff -r 44bd11f92528 -r 606654e9c935 crypto/external/bsd/openssh/dist/sftp.c
--- a/crypto/external/bsd/openssh/dist/sftp.c   Fri Sep 16 15:36:00 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/sftp.c   Fri Sep 16 15:36:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sftp.c,v 1.7 2011/07/25 03:03:11 christos Exp $        */
+/*     $NetBSD: sftp.c,v 1.8 2011/09/16 15:36:18 joerg Exp $   */
 /* $OpenBSD: sftp.c,v 1.132 2010/12/04 00:18:01 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm%openbsd.org@localhost>
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: sftp.c,v 1.7 2011/07/25 03:03:11 christos Exp $");
+__RCSID("$NetBSD: sftp.c,v 1.8 2011/09/16 15:36:18 joerg Exp $");
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
@@ -182,7 +182,7 @@
 int interactive_loop(struct sftp_conn *, const char *file1, const char *file2);
 
 /* ARGSUSED */
-static void
+__dead static void
 killchild(int signo)
 {
        if (sshpid > 1) {
@@ -2039,7 +2039,7 @@
        close(c_out);
 }
 
-static void
+__dead static void
 usage(void)
 {
        extern char *__progname;
diff -r 44bd11f92528 -r 606654e9c935 crypto/external/bsd/openssh/dist/ssh-agent.c
--- a/crypto/external/bsd/openssh/dist/ssh-agent.c      Fri Sep 16 15:36:00 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh-agent.c      Fri Sep 16 15:36:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ssh-agent.c,v 1.8 2011/09/07 17:49:19 christos Exp $   */
+/*     $NetBSD: ssh-agent.c,v 1.9 2011/09/16 15:36:18 joerg Exp $      */
 /* $OpenBSD: ssh-agent.c,v 1.172 2011/06/03 01:37:40 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: ssh-agent.c,v 1.8 2011/09/07 17:49:19 christos Exp $");
+__RCSID("$NetBSD: ssh-agent.c,v 1.9 2011/09/16 15:36:18 joerg Exp $");
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/queue.h>
@@ -1066,7 +1066,7 @@
 }
 
 /*ARGSUSED*/
-static void
+__dead static void
 cleanup_handler(int sig)
 {
        cleanup_socket();
@@ -1090,7 +1090,7 @@
        }
 }
 
-static void
+__dead static void
 usage(void)
 {
        fprintf(stderr, "usage: %s [options] [command [arg ...]]\n",
diff -r 44bd11f92528 -r 606654e9c935 crypto/external/bsd/openssh/dist/ssh-keygen.c
--- a/crypto/external/bsd/openssh/dist/ssh-keygen.c     Fri Sep 16 15:36:00 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh-keygen.c     Fri Sep 16 15:36:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ssh-keygen.c,v 1.7 2011/09/07 17:49:19 christos Exp $  */
+/*     $NetBSD: ssh-keygen.c,v 1.8 2011/09/16 15:36:18 joerg Exp $     */
 /* $OpenBSD: ssh-keygen.c,v 1.210 2011/04/18 00:46:05 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: ssh-keygen.c,v 1.7 2011/09/07 17:49:19 christos Exp $");
+__RCSID("$NetBSD: ssh-keygen.c,v 1.8 2011/09/16 15:36:18 joerg Exp $");
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
@@ -254,7 +254,7 @@
 #define SSH_COM_PRIVATE_BEGIN          "---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----"
 #define        SSH_COM_PRIVATE_KEY_MAGIC       0x3f6ff9eb
 
-static void
+__dead static void
 do_convert_to_ssh2(struct passwd *pw, Key *k)
 {
        u_int len;
@@ -280,7 +280,7 @@
        exit(0);
 }
 
-static void
+__dead static void