Module Name: src
Committed By: joerg
Date: Mon Aug 29 21:08:54 UTC 2011
Modified Files:
src/crypto/external/bsd/openssh/dist: packet.c packet.h ssh.c
sshconnect2.c
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/packet.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/sshconnect2.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.c
diff -u src/crypto/external/bsd/openssh/dist/packet.c:1.6 src/crypto/external/bsd/openssh/dist/packet.c:1.7
--- src/crypto/external/bsd/openssh/dist/packet.c:1.6 Mon Jul 25 03:03:10 2011
+++ src/crypto/external/bsd/openssh/dist/packet.c Mon Aug 29 21:08:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: packet.c,v 1.6 2011/07/25 03:03:10 christos Exp $ */
+/* $NetBSD: packet.c,v 1.7 2011/08/29 21:08:54 joerg Exp $ */
/* $OpenBSD: packet.c,v 1.172 2010/11/13 23:27:50 djm Exp $ */
/*
* Author: Tatu Ylonen <[email protected]>
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: packet.c,v 1.6 2011/07/25 03:03:10 christos Exp $");
+__RCSID("$NetBSD: packet.c,v 1.7 2011/08/29 21:08:54 joerg Exp $");
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
@@ -251,7 +251,7 @@
active_state->packet_timeout_ms = timeout * count * 1000;
}
-static void
+__dead static void
packet_stop_discard(void)
{
if (active_state->packet_discard_mac) {
Index: src/crypto/external/bsd/openssh/dist/packet.h
diff -u src/crypto/external/bsd/openssh/dist/packet.h:1.4 src/crypto/external/bsd/openssh/dist/packet.h:1.5
--- src/crypto/external/bsd/openssh/dist/packet.h:1.4 Mon Jul 25 03:03:10 2011
+++ src/crypto/external/bsd/openssh/dist/packet.h Mon Aug 29 21:08:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: packet.h,v 1.4 2011/07/25 03:03:10 christos Exp $ */
+/* $NetBSD: packet.h,v 1.5 2011/08/29 21:08:54 joerg Exp $ */
/* $OpenBSD: packet.h,v 1.55 2010/11/13 23:27:50 djm Exp $ */
/*
@@ -69,7 +69,7 @@
void *packet_get_string(u_int *length_ptr);
char *packet_get_cstring(u_int *length_ptr);
void *packet_get_string_ptr(u_int *length_ptr);
-void packet_disconnect(const char *fmt,...) __attribute__((format(printf, 1, 2)));
+__dead void packet_disconnect(const char *fmt,...) __attribute__((format(printf, 1, 2)));
void packet_send_debug(const char *fmt,...) __attribute__((format(printf, 1, 2)));
void set_newkeys(int mode);
Index: src/crypto/external/bsd/openssh/dist/ssh.c
diff -u src/crypto/external/bsd/openssh/dist/ssh.c:1.7 src/crypto/external/bsd/openssh/dist/ssh.c:1.8
--- src/crypto/external/bsd/openssh/dist/ssh.c:1.7 Mon Jul 25 08:51:10 2011
+++ src/crypto/external/bsd/openssh/dist/ssh.c Mon Aug 29 21:08:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ssh.c,v 1.7 2011/07/25 08:51:10 joerg Exp $ */
+/* $NetBSD: ssh.c,v 1.8 2011/08/29 21:08:54 joerg Exp $ */
/* $OpenBSD: ssh.c,v 1.356 2011/01/06 22:23:53 djm Exp $ */
/*
* Author: Tatu Ylonen <[email protected]>
@@ -42,7 +42,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: ssh.c,v 1.7 2011/07/25 08:51:10 joerg Exp $");
+__RCSID("$NetBSD: ssh.c,v 1.8 2011/08/29 21:08:54 joerg Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -184,7 +184,7 @@
/* Prints a help message to the user. This function never returns. */
-static void
+__dead static void
usage(void)
{
fprintf(stderr,
@@ -984,7 +984,7 @@
}
}
-static void
+__dead static void
client_cleanup_stdio_fwd(int id, void *arg)
{
debug("stdio forwarding: done");
Index: src/crypto/external/bsd/openssh/dist/sshconnect2.c
diff -u src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.8 src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.9
--- src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.8 Mon Jul 25 03:03:11 2011
+++ src/crypto/external/bsd/openssh/dist/sshconnect2.c Mon Aug 29 21:08:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sshconnect2.c,v 1.8 2011/07/25 03:03:11 christos Exp $ */
+/* $NetBSD: sshconnect2.c,v 1.9 2011/08/29 21:08:54 joerg Exp $ */
/* $OpenBSD: sshconnect2.c,v 1.186 2010/11/29 23:45:51 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sshconnect2.c,v 1.8 2011/07/25 03:03:11 christos Exp $");
+__RCSID("$NetBSD: sshconnect2.c,v 1.9 2011/08/29 21:08:54 joerg Exp $");
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
@@ -284,10 +284,10 @@
};
void input_userauth_success(int, u_int32_t, void *);
-void input_userauth_success_unexpected(int, u_int32_t, void *);
+__dead void input_userauth_success_unexpected(int, u_int32_t, void *);
void input_userauth_failure(int, u_int32_t, void *);
void input_userauth_banner(int, u_int32_t, void *);
-void input_userauth_error(int, u_int32_t, void *);
+__dead void input_userauth_error(int, u_int32_t, void *);
void input_userauth_info_req(int, u_int32_t, void *);
void input_userauth_pk_ok(int, u_int32_t, void *);
void input_userauth_passwd_changereq(int, u_int32_t, void *);
