From: Karel Zak <kzak@redhat.com>
Date: Wed, 23 May 2012 09:09:49 +0000 (+0200)
Subject: fdisk: always use stderr for debug messages
X-Git-Tag: v2.22-rc1~370
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70696820f8e6300c3a857731362aee28e5d4cfad;p=thirdparty%2Futil-linux.git

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 2471541b9d..bb210514cd 100644
--- 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 f97aa4fe45..058fc64c5f 100644
--- 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;
 }