diff options
author | Ondrej Oprala | 2014-03-13 11:53:31 +0100 |
---|---|---|
committer | Ondrej Oprala | 2014-03-13 11:53:31 +0100 |
commit | 274228fecc76877224501177b46c19d9715a6ada (patch) | |
tree | eb7230d86ec700a2fac47dcf343fe968f6ac8f09 /libfdisk | |
parent | libfdisk: use include/debug.h (diff) | |
download | kernel-qcow2-util-linux-274228fecc76877224501177b46c19d9715a6ada.tar.gz kernel-qcow2-util-linux-274228fecc76877224501177b46c19d9715a6ada.tar.xz kernel-qcow2-util-linux-274228fecc76877224501177b46c19d9715a6ada.zip |
clean up redundant macros and defines
Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
Diffstat (limited to 'libfdisk')
-rw-r--r-- | libfdisk/src/fdiskP.h | 10 | ||||
-rw-r--r-- | libfdisk/src/init.c | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h index d470110da..a945ed3a7 100644 --- a/libfdisk/src/fdiskP.h +++ b/libfdisk/src/fdiskP.h @@ -40,7 +40,6 @@ #define CONFIG_LIBFDISK_DEBUG #endif -#ifdef CONFIG_LIBFDISK_DEBUG # include <stdio.h> # include <stdarg.h> @@ -59,7 +58,6 @@ #define FDISK_DEF_FLAG(m) UL_DEFINE_FLAG(FDISK_DEBUG_, m) #define DBG(m, x) do { __UL_DBG(libfdisk, FDISK_DEBUG_, m, x); } while (0) -#define INIT_DBG(m) do { __UL_INIT_DEBUG(libfdisk, FDISK_DEBUG_, m, LIBFDISK_DEBUG); } while (0) # define ON_DBG(m, x) do { \ if ((FDISK_DEBUG_ ## m) & libfdisk_debug_mask) { \ @@ -85,14 +83,6 @@ dbgprint(const char *mesg, ...) UL_DEBUG_DECLARE_MASK(libfdisk); -#else /* !CONFIG_LIBFDISK_DEBUG */ -# define ON_DBG(m,x) do { ; } while (0) -# define DBG(m,x) do { ; } while (0) -# define INIT_DBG(m,x) do { ; } while (0) -# define DBG_FLUSH do { ; } while(0) -#endif - - #ifdef TEST_PROGRAM struct fdisk_test { const char *name; diff --git a/libfdisk/src/init.c b/libfdisk/src/init.c index c54b72a0c..e30c8b976 100644 --- a/libfdisk/src/init.c +++ b/libfdisk/src/init.c @@ -15,5 +15,5 @@ UL_DEBUG_DEFINE_MASK(libfdisk); */ void fdisk_init_debug(int mask) { - INIT_DBG(mask); + __UL_INIT_DEBUG(libfdisk, FDISK_DEBUG_, mask, LIBFDISK_DEBUG); } |