Module Name: src
Committed By: joerg
Date: Thu Nov 17 16:20:47 UTC 2011
Modified Files:
src/sbin/iscsictl: iscsic_globals.h iscsic_main.c
src/sbin/iscsid: iscsid_globals.h
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sbin/iscsictl/iscsic_globals.h \
src/sbin/iscsictl/iscsic_main.c
cvs rdiff -u -r1.2 -r1.3 src/sbin/iscsid/iscsid_globals.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/iscsictl/iscsic_globals.h
diff -u src/sbin/iscsictl/iscsic_globals.h:1.3 src/sbin/iscsictl/iscsic_globals.h:1.4
--- src/sbin/iscsictl/iscsic_globals.h:1.3 Sun Oct 30 18:40:06 2011
+++ src/sbin/iscsictl/iscsic_globals.h Thu Nov 17 16:20:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsic_globals.h,v 1.3 2011/10/30 18:40:06 christos Exp $ */
+/* $NetBSD: iscsic_globals.h,v 1.4 2011/11/17 16:20:47 joerg Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -152,13 +152,13 @@ ntohq(uint64_t x)
/* iscsic_main.c */
-void arg_error(char *, const char *, ...) __printflike(2, 3);
-void arg_missing(const char *);
-void io_error(const char *, ...) __printflike(1, 2);
-void gen_error(const char *, ...) __printflike(1, 2);
+void arg_error(char *, const char *, ...) __printflike(2, 3) __dead;
+void arg_missing(const char *) __dead;
+void io_error(const char *, ...) __printflike(1, 2) __dead;
+void gen_error(const char *, ...) __printflike(1, 2) __dead;
void check_extra_args(int, char **);
-void status_error(unsigned);
-void status_error_slist(unsigned);
+void status_error(unsigned) __dead;
+void status_error_slist(unsigned) __dead;
void send_request(unsigned, size_t, void *);
iscsid_response_t *get_response(int);
Index: src/sbin/iscsictl/iscsic_main.c
diff -u src/sbin/iscsictl/iscsic_main.c:1.3 src/sbin/iscsictl/iscsic_main.c:1.4
--- src/sbin/iscsictl/iscsic_main.c:1.3 Sun Oct 30 18:40:06 2011
+++ src/sbin/iscsictl/iscsic_main.c Thu Nov 17 16:20:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsic_main.c,v 1.3 2011/10/30 18:40:06 christos Exp $ */
+/* $NetBSD: iscsic_main.c,v 1.4 2011/11/17 16:20:47 joerg Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -219,7 +219,7 @@ int debug_level = ISCSI_DEBUG; /* How
* Cleanup and exit. Does not return.
*/
-static void
+__dead static void
bye(void)
{
close(sock);
Index: src/sbin/iscsid/iscsid_globals.h
diff -u src/sbin/iscsid/iscsid_globals.h:1.2 src/sbin/iscsid/iscsid_globals.h:1.3
--- src/sbin/iscsid/iscsid_globals.h:1.2 Sat Oct 29 16:54:49 2011
+++ src/sbin/iscsid/iscsid_globals.h Thu Nov 17 16:20:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_globals.h,v 1.2 2011/10/29 16:54:49 christos Exp $ */
+/* $NetBSD: iscsid_globals.h,v 1.3 2011/11/17 16:20:47 joerg Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -418,7 +418,7 @@ int debug_level; /* How much info to
/* iscsid_main.c */
iscsid_response_t *make_rsp(size_t, iscsid_response_t **, int *);
-void exit_daemon(void);
+void exit_daemon(void) __dead;
/* iscsid_lists.c */
