[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Sun Jan 1 14:33:11 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/3d978299c0eb
changeset: 257:3d978299c0eb
user:      ray at terran.dlink.ua
date:      Sun Jan 01 16:33:34 2012 +0200
description:
_Noreturn is good, but better to keep makefs buildable.

diffstat:

 head/usr.sbin/makefs/ffs/ffs_extern.h |  2 +-
 head/usr.sbin/makefs/ffs/ffs_subr.c   |  2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r a4b07fc27f45 -r 3d978299c0eb head/usr.sbin/makefs/ffs/ffs_extern.h

--- a/head/usr.sbin/makefs/ffs/ffs_extern.h	Sun Jan 01 15:29:27 2012 +0200
+++ b/head/usr.sbin/makefs/ffs/ffs_extern.h	Sun Jan 01 16:33:34 2012 +0200
@@ -48,7 +48,7 @@
 };
 
 	/* ffs.c */
-_Noreturn void panic(const char *, ...) __printflike(1, 2);
+void panic(const char *, ...) __printflike(1, 2);
 
 	/* ffs_alloc.c */
 int ffs_alloc(struct inode *, daddr_t, daddr_t, int, daddr_t *);
diff -r a4b07fc27f45 -r 3d978299c0eb head/usr.sbin/makefs/ffs/ffs_subr.c
--- a/head/usr.sbin/makefs/ffs/ffs_subr.c	Sun Jan 01 15:29:27 2012 +0200
+++ b/head/usr.sbin/makefs/ffs/ffs_subr.c	Sun Jan 01 16:33:34 2012 +0200
@@ -104,6 +104,7 @@
 	default:
 		panic("ffs_isblock: unknown fs_fragshift %d",
 		    (int)fs->fs_fragshift);
+		return (-1);
 	}
 }
 
@@ -131,6 +132,7 @@
 	default:
 		panic("ffs_isfreeblock: unknown fs_fragshift %d",
 		    (int)fs->fs_fragshift);
+		return (-1);
 	}
 }
 
