ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clean up redundant macros and defines 

Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
This commit is contained in:
Ondrej Oprala 2014-03-13 11:53:31 +01:00
parent 2618b9cc1f
commit 274228fecc
8 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/debug.h
View File

@ -7,9 +7,6 @@
#ifndef UTIL_LINUX_DEBUG_H
#define UTIL_LINUX_DEBUG_H
#define _UL_DEBUG
#ifdef _UL_DEBUG
#include <stdarg.h>
#define UL_DEBUG_DEFINE_MASK(m) int m ## _debug_mask
@ -66,9 +63,4 @@ ul_debugobj(void *handler, const char *mesg, ...)
fputc('\n', stderr);
}
#else /* !_UL_DEBUG */
# define __UL_DBG(l, p, m, x) do { ; } while (0)
#define __UL_INIT_DEBUG(lib, pref, mask, env) do { ; } while (0)
#endif
#endif /* UTIL_LINUX_DEBUG_H */

9
libblkid/src/blkidP.h
View File

@ -337,15 +337,11 @@ struct blkid_struct_cache
#define BLKID_DEF_FLAG(m) UL_DEFINE_FLAG(BLKID_DEBUG_, m)
#ifdef CONFIG_BLKID_DEBUG
UL_DEBUG_DECLARE_MASK(libblkid);
extern void blkid_debug_dump_dev(blkid_dev dev);
extern void blkid_debug_dump_tag(blkid_tag tag);
#define DBG(m, x) do { __UL_DBG(libblkid, BLKID_DEBUG_, m, x); } while (0)
#define INIT_DBG(m) do { __UL_INIT_DEBUG(libblkid, BLKID_DEBUG_, m, LIBBLKID_DEBUG); } while (0)
static inline void __attribute__ ((__format__ (__printf__, 1, 2)))
blkid_debug(const char *mesg, ...)
@ -357,11 +353,6 @@ blkid_debug(const char *mesg, ...)
fputc('\n', stderr);
}
#else /* !CONFIG_BLKID_DEBUG */
# define DBG(m,x) do { ; } while (0)
# define INIT_DBG(m) do { ; } while (0)
#endif /* CONFIG_BLKID_DEBUG */
/* devno.c */
struct dir_list {
char *name;

2
libblkid/src/init.c
View File

@ -29,7 +29,7 @@ UL_DEBUG_DEFINE_MASK(libblkid);
*/
void blkid_init_debug(int mask)
{
INIT_DBG(mask);
__UL_INIT_DEBUG(libblkid, BLKID_DEBUG_, mask, LIBBLKID_DEBUG);
if (libblkid_debug_mask != BLKID_DEBUG_INIT) {
const char *ver = NULL;

10
libfdisk/src/fdiskP.h
View File

@ -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;

2
libfdisk/src/init.c
View File

@ -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);
}

2
libmount/src/init.c
View File

@ -29,7 +29,7 @@ UL_DEBUG_DEFINE_MASK(libmount);
*/
void mnt_init_debug(int mask)
{
INIT_DBG(mask);
__UL_INIT_DEBUG(libmount, MNT_DEBUG_, mask, LIBMOUNT_DEBUG);
if (libmount_debug_mask != MNT_DEBUG_INIT) {
const char *ver = NULL;

10
libmount/src/mountP.h
View File

@ -55,12 +55,10 @@
#define MNT_DEF_FLAG(m) UL_DEFINE_FLAG(MNT_DEBUG_, m)
#ifdef CONFIG_LIBMOUNT_DEBUG
# include <stdio.h>
# include <stdarg.h>
#define DBG(m, x) do { __UL_DBG(libmount, MNT_DEBUG_, m, x); } while (0)
#define INIT_DBG(m) do { __UL_INIT_DEBUG(libmount, MNT_DEBUG_, m, LIBMOUNT_DEBUG); } while (0)
# define WARN_REFCOUNT(m, o, r) \
do { \
@ -106,14 +104,6 @@ mnt_debug_h(void *handler, const char *mesg, ...)
fputc('\n', stderr);
}
#else /* !CONFIG_LIBMOUNT_DEBUG */
# define WARN_REFCOUNT(m,o,r) do { ; } while (0)
# 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
/* extension for files in the directory */
#define MNT_MNTTABDIR_EXT ".fstab"

2
libmount/src/test.c
View File

@ -31,7 +31,7 @@ int mnt_run_test(struct libmnt_test *tests, int argc, char *argv[])
strcmp(argv[1], "-h") == 0)
goto usage;
INIT_DBG(0);
mnt_init_debug(0);
for (ts = tests; ts->name; ts++) {
if (strcmp(ts->name, argv[1]) == 0) {