From 236abf7d17506b9a8d92f6c5e72c60036f38960c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 16 Dec 2008 09:42:41 -0800 Subject: [PATCH] Remove assfail() chunk, it just complicates things and is never used --- .topdeps | 4 +--- .topmsg | 18 +++--------------- lib/libuutil/uu_misc.c | 12 ------------ 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/.topdeps b/.topdeps index 607c231780..7f16cbcdd5 100644 --- a/.topdeps +++ b/.topdeps @@ -1,3 +1 @@ -gcc-branch -fix-branch -feature-branch +zfs-branch diff --git a/.topmsg b/.topmsg index e9722e1075..e16740584b 100644 --- a/.topmsg +++ b/.topmsg @@ -1,19 +1,7 @@ From: Brian Behlendorf -Subject: [PATCH] zfs branch +Subject: [PATCH] linux unused -Merged result of all changes which are relevant to both Solaris -and Linux builds of the ZFS code. These are changes where there -is a reasonable chance they will be accepted upstream. - -Additionally, since this is effectively the root of the linux -ZFS tree the core linux build system is added here. This -includes autogen.sh, configure.ac, m4 macros, some scripts/*, -and makefiles for all the core ZFS components. Linux-only -features which require tweaks to the build system should appear -on the relevant topic branches. All autotools products which -result from autogen.sh are commited to the linux-configure-branch. - -This branch also contains the META, ChangeLog, AUTHORS, -README, and GIT files. +Track various large hunks which have been dropped simply +because they are not relevant to this port. Signed-off-by: Brian Behlendorf diff --git a/lib/libuutil/uu_misc.c b/lib/libuutil/uu_misc.c index d64c600345..b3b4a65133 100644 --- a/lib/libuutil/uu_misc.c +++ b/lib/libuutil/uu_misc.c @@ -208,18 +208,6 @@ uu_panic(const char *format, ...) (void) pause(); } -int -assfail(const char *astring, const char *file, int line) -{ -#if defined(__STDC__) && __STDC_VERSION__ - 0 >= 199901L - __assert_c99(astring, file, line, "unknown func"); -#else - __assert(astring, file, line); -#endif - /*NOTREACHED*/ - return (0); -} - static void uu_lockup(void) {