diff options
| author | Karel Zak | 2013-04-08 18:22:13 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-04-08 18:22:13 +0200 |
| commit | 0540ea544d4b459bc148d29645225190b76ca8b7 (patch) | |
| tree | f0902ec8cb04f8148ffd87170c2f1bdd7534564e /libblkid/src/dev.c | |
| parent | bash-completion: Symlink runuser symlink to su so it gets loaded on demand. (diff) | |
| download | kernel-qcow2-util-linux-0540ea544d4b459bc148d29645225190b76ca8b7.tar.gz kernel-qcow2-util-linux-0540ea544d4b459bc148d29645225190b76ca8b7.tar.xz kernel-qcow2-util-linux-0540ea544d4b459bc148d29645225190b76ca8b7.zip | |
libblkid: clean up DBG()
- use stderr only
- use BLKID_ prefix for debug masks
- don't use \n in in messages and don't use printf(),
but use generic blkid_debug().
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid/src/dev.c')
| -rw-r--r-- | libblkid/src/dev.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libblkid/src/dev.c b/libblkid/src/dev.c index 9180e4823..11d0a02ec 100644 --- a/libblkid/src/dev.c +++ b/libblkid/src/dev.c @@ -48,10 +48,10 @@ void blkid_free_dev(blkid_dev dev) if (!dev) return; - DBG(DEBUG_DEV, - printf(" freeing dev %s (%s)\n", dev->bid_name, dev->bid_type ? + DBG(DEV, + blkid_debug(" freeing dev %s (%s)", dev->bid_name, dev->bid_type ? dev->bid_type : "(null)")); - DBG(DEBUG_DEV, blkid_debug_dump_dev(dev)); + DBG(DEV, blkid_debug_dump_dev(dev)); list_del(&dev->bid_devs); while (!list_empty(&dev->bid_tags)) { @@ -82,21 +82,20 @@ void blkid_debug_dump_dev(blkid_dev dev) return; } - printf(" dev: name = %s\n", dev->bid_name); - printf(" dev: DEVNO=\"0x%0llx\"\n", (long long)dev->bid_devno); - printf(" dev: TIME=\"%ld.%ld\"\n", (long)dev->bid_time, (long)dev->bid_utime); - printf(" dev: PRI=\"%d\"\n", dev->bid_pri); - printf(" dev: flags = 0x%08X\n", dev->bid_flags); + fprintf(stderr, " dev: name = %s\n", dev->bid_name); + fprintf(stderr, " dev: DEVNO=\"0x%0llx\"\n", (long long)dev->bid_devno); + fprintf(stderr, " dev: TIME=\"%ld.%ld\"\n", (long)dev->bid_time, (long)dev->bid_utime); + fprintf(stderr, " dev: PRI=\"%d\"\n", dev->bid_pri); + fprintf(stderr, " dev: flags = 0x%08X\n", dev->bid_flags); list_for_each(p, &dev->bid_tags) { blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); if (tag) - printf(" tag: %s=\"%s\"\n", tag->bit_name, + fprintf(stderr, " tag: %s=\"%s\"\n", tag->bit_name, tag->bit_val); else - printf(" tag: NULL\n"); + fprintf(stderr, " tag: NULL\n"); } - printf("\n"); } #endif |