Module Name: src
Committed By: joerg
Date: Sat Feb 4 18:36:30 UTC 2012
Modified Files:
src/usr.sbin/perfused: msg.c perfused.c perfused.h
Log Message:
Mark perfused_panic as dead. Canonical form of infinite loops is
for (;;). Remove completely redundant NOTREACHED markers.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/perfused/msg.c
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/perfused/perfused.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/perfused/perfused.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.sbin/perfused/msg.c
diff -u src/usr.sbin/perfused/msg.c:1.19 src/usr.sbin/perfused/msg.c:1.20
--- src/usr.sbin/perfused/msg.c:1.19 Fri Feb 3 15:54:15 2012
+++ src/usr.sbin/perfused/msg.c Sat Feb 4 18:36:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.c,v 1.19 2012/02/03 15:54:15 manu Exp $ */
+/* $NetBSD: msg.c,v 1.20 2012/02/04 18:36:30 joerg Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -489,8 +489,6 @@ perfused_readframe(struct puffs_usermoun
switch (readen = recv(fd, data, len, MSG_NOSIGNAL|MSG_PEEK)) {
case 0:
perfused_panic();
- /* NOTREACHED */
- break;
case -1:
if (errno == EAGAIN)
return 0;
@@ -536,16 +534,11 @@ perfused_readframe(struct puffs_usermoun
case 0:
DWARNX("%s: recv returned 0", __func__);
perfused_panic();
-
- /* NOTREACHED */
- break;
case -1:
if (errno == EAGAIN)
return 0;
DWARN("%s: recv returned -1", __func__);
return errno;
- /* NOTREACHED */
- break;
default:
break;
}
Index: src/usr.sbin/perfused/perfused.c
diff -u src/usr.sbin/perfused/perfused.c:1.21 src/usr.sbin/perfused/perfused.c:1.22
--- src/usr.sbin/perfused/perfused.c:1.21 Fri Feb 3 15:54:15 2012
+++ src/usr.sbin/perfused/perfused.c Sat Feb 4 18:36:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: perfused.c,v 1.21 2012/02/03 15:54:15 manu Exp $ */
+/* $NetBSD: perfused.c,v 1.22 2012/02/04 18:36:30 joerg Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -455,12 +455,11 @@ main(int argc, char **argv)
case SOCK_DGRAM:
new_mount(s, PMNT_DEVFUSE|PMNT_DGRAM);
exit(0);
- break;
case SOCK_SEQPACKET:
if (listen(s, 0) != 0)
DERR(EX_OSERR, "listen failed");
- do {
+ for (;;) {
int fd;
struct sockaddr_un sun;
struct sockaddr *sa;
@@ -471,8 +470,7 @@ main(int argc, char **argv)
DERR(EX_OSERR, "accept failed");
new_mount(fd, PMNT_DEVFUSE);
- } while (1 /* CONSTCOND */);
- break;
+ }
default:
DERRX(EX_SOFTWARE, "unexpected so_type %d", sock_type);
break;
@@ -487,7 +485,4 @@ perfused_panic(void)
{
DWARNX("filesystem crashed");
exit(EX_OK);
-
- /* NOTREACHED */
- return;
}
Index: src/usr.sbin/perfused/perfused.h
diff -u src/usr.sbin/perfused/perfused.h:1.9 src/usr.sbin/perfused/perfused.h:1.10
--- src/usr.sbin/perfused/perfused.h:1.9 Fri Feb 3 15:54:15 2012
+++ src/usr.sbin/perfused/perfused.h Sat Feb 4 18:36:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: perfused.h,v 1.9 2012/02/03 15:54:15 manu Exp $ */
+/* $NetBSD: perfused.h,v 1.10 2012/02/04 18:36:30 joerg Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -66,7 +66,7 @@ perfuse_msg_t *perfused_new_pb(struct pu
int perfused_xchg_pb(struct puffs_usermount *, perfuse_msg_t *, size_t,
enum perfuse_xchg_pb_reply);
-void perfused_panic(void);
+void perfused_panic(void) __dead;
__END_DECLS
