Module Name: src
Committed By: riz
Date: Sat May 19 17:32:46 UTC 2012
Modified Files:
src/usr.bin/login [netbsd-6]: common.c common.h
Log Message:
Pull up following revision(s) (requested by christos in ticket #271):
usr.bin/login/common.c: revision 1.6
usr.bin/login/common.h: revision 1.4
- use __dead consistently.
- more clang build.
- use __dead consistently.
- more clang build.
To generate a diff of this commit:
cvs rdiff -u -r1.3.8.2 -r1.3.8.3 src/usr.bin/login/common.c
cvs rdiff -u -r1.1.8.1 -r1.1.8.2 src/usr.bin/login/common.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/login/common.c
diff -u src/usr.bin/login/common.c:1.3.8.2 src/usr.bin/login/common.c:1.3.8.3
--- src/usr.bin/login/common.c:1.3.8.2 Fri May 18 17:02:31 2012
+++ src/usr.bin/login/common.c Sat May 19 17:32:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.3.8.2 2012/05/18 17:02:31 riz Exp $ */
+/* $NetBSD: common.c,v 1.3.8.3 2012/05/19 17:32:46 riz Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: common.c,v 1.3.8.2 2012/05/18 17:02:31 riz Exp $");
+__RCSID("$NetBSD: common.c,v 1.3.8.3 2012/05/19 17:32:46 riz Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -155,7 +155,7 @@ sigint(int signo)
}
/* ARGSUSED */
-void
+void __dead
timedout(int signo)
{
@@ -372,7 +372,7 @@ stypeof(const char *ttyid)
return (ttyid && (t = getttynam(ttyid)) ? t->ty_type : NULL);
}
-void
+void __dead
sleepexit(int eval)
{
Index: src/usr.bin/login/common.h
diff -u src/usr.bin/login/common.h:1.1.8.1 src/usr.bin/login/common.h:1.1.8.2
--- src/usr.bin/login/common.h:1.1.8.1 Mon May 7 16:24:07 2012
+++ src/usr.bin/login/common.h Sat May 19 17:32:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.1.8.1 2012/05/07 16:24:07 riz Exp $ */
+/* $NetBSD: common.h,v 1.1.8.2 2012/05/19 17:32:46 riz Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -37,10 +37,10 @@ char *trimloginname(char *);
char *getloginname(void);
void motd(const char *);
int rootterm(char *);
-void sigint(int);
-void sleepexit(int);
+void __dead sigint(int);
+void __dead sleepexit(int);
const char *stypeof(const char *);
-void timedout(int);
+void __dead timedout(int);
void decode_ss(const char *);
extern u_int timeout;