diff options
| author | Mark J Musante <Mark.Musante@Sun.COM> | 2008-12-04 10:07:24 -0500 |
|---|---|---|
| committer | Mark J Musante <Mark.Musante@Sun.COM> | 2008-12-04 10:07:24 -0500 |
| commit | deb8317b8f5925e3f6dd7cb6ed0cdd035f546a5a (patch) | |
| tree | f3a89e055bf54e9000a2dda0f69c7933b5a2f141 /usr/src/uts/common/sys/debug.h | |
| parent | 5f41bf46ca5230bc3ee6b7d6a714a3a16a390261 (diff) | |
| download | illumos-joyent-deb8317b8f5925e3f6dd7cb6ed0cdd035f546a5a.tar.gz | |
6674216 "zfs share" doesn't work, but "zfs set sharenfs=on" does
6621164 $SRC/cmd/zfs/zfs_main.c seems to have a syntax error in the translation note
6635482 i18n problems in libzfs_dataset.c and zfs_main.c
6595194 "zfs get" VALUE column is as wide as NAME
6722991 vdev_disk.c: error checking for ddi_pathname_to_dev_t() must test for NODEV
6396518 ASSERT strings shouldn't be pre-processed
Diffstat (limited to 'usr/src/uts/common/sys/debug.h')
| -rw-r--r-- | usr/src/uts/common/sys/debug.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/usr/src/uts/common/sys/debug.h b/usr/src/uts/common/sys/debug.h index c156e7c463..ce941e8dae 100644 --- a/usr/src/uts/common/sys/debug.h +++ b/usr/src/uts/common/sys/debug.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -31,8 +30,6 @@ #ifndef _SYS_DEBUG_H #define _SYS_DEBUG_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/isa_defs.h> #include <sys/types.h> @@ -51,7 +48,7 @@ extern "C" { extern int assfail(const char *, const char *, int); #define VERIFY(EX) ((void)((EX) || assfail(#EX, __FILE__, __LINE__))) #if DEBUG -#define ASSERT(EX) VERIFY(EX) +#define ASSERT(EX) ((void)((EX) || assfail(#EX, __FILE__, __LINE__))) #else #define ASSERT(x) ((void)0) #endif @@ -59,7 +56,7 @@ extern int assfail(const char *, const char *, int); extern int assfail(); #define VERIFY(EX) ((void)((EX) || assfail("EX", __FILE__, __LINE__))) #if DEBUG -#define ASSERT(EX) VERIFY(EX) +#define ASSERT(EX) ((void)((EX) || assfail("EX", __FILE__, __LINE__))) #else #define ASSERT(x) ((void)0) #endif @@ -99,9 +96,9 @@ _NOTE(CONSTCOND) } while (0) #define VERIFY3U(x, y, z) VERIFY3_IMPL(x, y, z, uint64_t) #define VERIFY3P(x, y, z) VERIFY3_IMPL(x, y, z, uintptr_t) #if DEBUG -#define ASSERT3S(x, y, z) VERIFY3S(x, y, z) -#define ASSERT3U(x, y, z) VERIFY3U(x, y, z) -#define ASSERT3P(x, y, z) VERIFY3P(x, y, z) +#define ASSERT3S(x, y, z) VERIFY3_IMPL(x, y, z, int64_t) +#define ASSERT3U(x, y, z) VERIFY3_IMPL(x, y, z, uint64_t) +#define ASSERT3P(x, y, z) VERIFY3_IMPL(x, y, z, uintptr_t) #else #define ASSERT3S(x, y, z) ((void)0) #define ASSERT3U(x, y, z) ((void)0) |