fdisk: always use stderr for debug messages

 * add dbgprint() to provide standardized debug output

 * print initial debug message to stderr

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index 2471541b9da0f68f8079d04c58654cdda4971e23..bb210514cdd35649e253f299f85ebfdcae71ee33 100644 (file)
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
@@ -56,6 +56,16 @@
                                        fflush(stderr);                 \
                        } while(0)
 
+static inline void __attribute__ ((__format__ (__printf__, 1, 2)))
+dbgprint(const char *mesg, ...)
+{
+       va_list ap;
+       va_start(ap, mesg);
+       vfprintf(stderr, mesg, ap);
+       va_end(ap);
+       fputc('\n', stderr);
+}
+
 extern int fdisk_debug_mask;
 extern void fdisk_init_debug(int mask);
 

diff --git a/fdisk/utils.c b/fdisk/utils.c
index f97aa4fe45f6f2e7c3f6ca7eb767a8e6d8e65fcb..058fc64c5fcee39f8914024bc36756d44adb27ba 100644 (file)
--- a/fdisk/utils.c
+++ b/fdisk/utils.c
@@ -48,7 +48,7 @@ void fdisk_init_debug(int mask)
                fdisk_debug_mask = mask;
 
        if (fdisk_debug_mask)
-               printf("fdisk: debug mask set to 0x%04x.\n",
+               fprintf(stderr, "fdisk: debug mask set to 0x%04x.\n",
                       fdisk_debug_mask);
        fdisk_debug_mask |= FDISK_DEBUG_INIT;
 }