Update debug.h to standardize VERIFY3_IMPL error messages in debug and non-debug mode

This commit is contained in:
Brian Behlendorf 2009-01-22 09:41:47 -08:00
parent 064bbffb63
commit 511176398c
2 changed files with 14 additions and 12 deletions

View File

@ -229,9 +229,10 @@ do { \
#define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \ #define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \
do { \ do { \
if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \ if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \
printk(KERN_ERR "VERIFY3(" #LEFT " " #OP " " #RIGHT \ printk(KERN_ERR \
" failed (" FMT ", " FMT ")\n", CAST (LEFT), \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
CAST (RIGHT)); \ "failed (" FMT " " #OP " " FMT ")\n", \
CAST (LEFT), CAST (RIGHT)); \
SBUG(); \ SBUG(); \
} \ } \
} while (0) } while (0)
@ -331,7 +332,8 @@ do { \
if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \ if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \
spl_debug_msg(NULL, DEBUG_SUBSYSTEM, D_EMERG, \ spl_debug_msg(NULL, DEBUG_SUBSYSTEM, D_EMERG, \
__FILE__, __FUNCTION__, __LINE__, \ __FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" FMT " " #OP " " FMT ")\n", \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"failed (" FMT " " #OP " " FMT ")\n", \
CAST (LEFT), CAST (RIGHT)); \ CAST (LEFT), CAST (RIGHT)); \
SBUG(); \ SBUG(); \
} \ } \

View File

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
# libtoolT - Provide generalized library-building support services. # libtoolT - Provide generalized library-building support services.
# Generated automatically by (GNU spl 0.4.0) # Generated automatically by (GNU spl 0.4.1)
# NOTE: Changes made to this file will be lost: look at ltmain.sh. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
# #
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001