Module Name: src
Committed By: joerg
Date: Tue Aug 30 21:14:06 UTC 2011
Modified Files:
src/usr.sbin/faithd: faithd.c faithd.h tcp.c
Log Message:
__dead + __printflike
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/faithd/faithd.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/faithd/faithd.h \
src/usr.sbin/faithd/tcp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/faithd/faithd.c
diff -u src/usr.sbin/faithd/faithd.c:1.33 src/usr.sbin/faithd/faithd.c:1.34
--- src/usr.sbin/faithd/faithd.c:1.33 Fri Nov 26 18:58:43 2010
+++ src/usr.sbin/faithd/faithd.c Tue Aug 30 21:14:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: faithd.c,v 1.33 2010/11/26 18:58:43 christos Exp $ */
+/* $NetBSD: faithd.c,v 1.34 2011/08/30 21:14:06 joerg Exp $ */
/* $KAME: faithd.c,v 1.62 2003/08/19 21:20:33 itojun Exp $ */
/*
@@ -95,19 +95,18 @@
static int inetd_main(int, char **);
static int daemon_main(int, char **);
-static void play_service(int);
+static void play_service(int) __dead;
static void play_child(int, struct sockaddr *);
static int faith_prefix(struct sockaddr *);
static int map6to4(struct sockaddr_in6 *, struct sockaddr_in *);
static void sig_child(int);
-static void sig_terminate(int);
+static void sig_terminate(int) __dead;
static void start_daemon(void);
-static void exit_stderr(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
+static void exit_stderr(const char *, ...) __printflike(1, 2) __dead;
static void grab_myaddrs(void);
static void free_myaddrs(void);
static void update_myaddrs(void);
-static void usage(void) __attribute__((__noreturn__));
+static void usage(void) __dead;
int
main(int argc, char **argv)
@@ -675,7 +674,7 @@
(long)pid, status);
}
-void
+static void
/*ARGSUSED*/
sig_terminate(int sig)
{
Index: src/usr.sbin/faithd/faithd.h
diff -u src/usr.sbin/faithd/faithd.h:1.10 src/usr.sbin/faithd/faithd.h:1.11
--- src/usr.sbin/faithd/faithd.h:1.10 Fri Nov 26 18:58:43 2010
+++ src/usr.sbin/faithd/faithd.h Tue Aug 30 21:14:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: faithd.h,v 1.10 2010/11/26 18:58:43 christos Exp $ */
+/* $NetBSD: faithd.h,v 1.11 2011/08/30 21:14:06 joerg Exp $ */
/* $KAME: faithd.h,v 1.9 2002/05/09 09:41:24 itojun Exp $ */
/*
@@ -33,14 +33,12 @@
extern char logname[];
extern int dflag;
-extern void tcp_relay(int, int, const char *);
+extern void tcp_relay(int, int, const char *) __dead;
extern void ftp_relay(int, int);
extern int ftp_active(int, int, int *, int *);
extern int ftp_passive(int, int, int *, int *);
-extern void exit_success(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
-extern void exit_failure(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
+extern void exit_success(const char *, ...) __dead __printflike(1, 2);
+extern void exit_failure(const char *, ...) __dead __printflike(1, 2);
#define DEFAULT_PORT_NAME "telnet"
#define DEFAULT_DIR "/usr/libexec"
Index: src/usr.sbin/faithd/tcp.c
diff -u src/usr.sbin/faithd/tcp.c:1.10 src/usr.sbin/faithd/tcp.c:1.11
--- src/usr.sbin/faithd/tcp.c:1.10 Fri Nov 26 18:58:43 2010
+++ src/usr.sbin/faithd/tcp.c Tue Aug 30 21:14:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp.c,v 1.10 2010/11/26 18:58:43 christos Exp $ */
+/* $NetBSD: tcp.c,v 1.11 2011/08/30 21:14:06 joerg Exp $ */
/* $KAME: tcp.c,v 1.10 2002/08/20 23:01:01 itojun Exp $ */
/*
@@ -64,11 +64,11 @@
static time_t parent_lastactive = (time_t)0;
static void sig_ctimeout(int);
-static void sig_child(int);
+static void sig_child(int) __dead;
static void notify_inactive(void);
static void notify_active(void);
static void send_data(int, int, const char *, int);
-static void relay(int, int, const char *, int);
+static void relay(int, int, const char *, int) __dead;
/*
* Inactivity timer:
