Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark perfused_panic as dead. Canonical form of infinite loops is

Browse Source 
for (;;). Remove completely redundant NOTREACHED markers.
This commit is contained in:
joerg 2012-02-04 18:36:30 +00:00
parent 66ecc48cbd
commit 520acca96b
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/perfused/msg.c
View File

@ -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_usermount *pu, struct puffs_framebuf *pufbuf,
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_usermount *pu, struct puffs_framebuf *pufbuf,
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;
}

11
usr.sbin/perfused/perfused.c
View File

@ -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;
}

4
usr.sbin/perfused/perfused.h
View File

@ -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 puffs_usermount *,
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