From: Karel Zak <kzak@redhat.com>
Date: Tue, 21 May 2013 13:30:16 +0000 (+0200)
Subject: libfdisk: add FDISK_DEBUG_FRONTEND
X-Git-Tag: v2.24-rc1~237
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36050e7001d7a44ac64a3e0513665fba649ff054;p=thirdparty%2Futil-linux.git

libfdisk: add FDISK_DEBUG_FRONTEND

Currently we use private libfdisk in fdisk code, because the library
API is not stable yet. Let's add debug flag to make it obvious in the
debug output what is from libfdisk and what is from fdisk frontend.

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

diff --git a/fdisks/fdisk-menu.c b/fdisks/fdisk-menu.c
index b8cea82373..0ea3dc1d31 100644
--- a/fdisks/fdisk-menu.c
+++ b/fdisks/fdisk-menu.c
@@ -266,15 +266,15 @@ static int menu_detect_collisions(struct fdisk_context *cxt)
 
 		r = get_fdisk_menu_entry(cxt, e->key, NULL);
 		if (!r) {
-			DBG(CONTEXT, dbgprint("warning: not found "
+			DBG(FRONTEND, dbgprint("warning: not found "
 					"entry for %c", e->key));
 			return -1;
 		}
 		if (r != e) {
-			DBG(CONTEXT, dbgprint("warning: duplicate key '%c'",
+			DBG(FRONTEND, dbgprint("warning: duplicate key '%c'",
 						e->key));
-			DBG(CONTEXT, dbgprint("         %s", e->title));
-			DBG(CONTEXT, dbgprint("         %s", r->title));
+			DBG(FRONTEND, dbgprint("         %s", e->title));
+			DBG(FRONTEND, dbgprint("         %s", r->title));
 			abort();
 		}
 	}
@@ -287,7 +287,7 @@ int print_fdisk_menu(struct fdisk_context *cxt)
 	struct menu_context mc = MENU_CXT_EMPTY;
 	const struct menu_entry *e;
 
-	ON_DBG(CONTEXT, menu_detect_collisions(cxt));
+	ON_DBG(FRONTEND, menu_detect_collisions(cxt));
 
 	if (fdisk_context_display_details(cxt))
 		printf(_("\nHelp (expert commands):\n"));
@@ -340,7 +340,7 @@ int process_fdisk_menu(struct fdisk_context *cxt)
 		return -EINVAL;
 	}
 
-	DBG(CONTEXT, dbgprint("selected: key=%c, entry='%s'",
+	DBG(FRONTEND, dbgprint("selected: key=%c, entry='%s'",
 				key, ent->title));
 	/* hardcoded help */
 	if (key == 'm') {
@@ -370,7 +370,7 @@ static int gpt_menu_cb(struct fdisk_context *cxt,
 	assert(ent);
 	assert(fdisk_is_disklabel(cxt, GPT));
 
-	DBG(CONTEXT, dbgprint("enter GPT menu"));
+	DBG(FRONTEND, dbgprint("enter GPT menu"));
 
 	rc = fdisk_ask_partnum(cxt, &n, FALSE);
 	if (rc)
diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h
index 1114f8cf10..6a184a0b7d 100644
--- a/libfdisk/src/fdiskP.h
+++ b/libfdisk/src/fdiskP.h
@@ -49,6 +49,7 @@
 #define FDISK_DEBUG_GEOMETRY    (1 << 4)
 #define FDISK_DEBUG_LABEL       (1 << 5)
 #define FDISK_DEBUG_ASK         (1 << 6)
+#define FDISK_DEBUG_FRONTEND	(1 << 7)
 #define FDISK_DEBUG_ALL		0xFFFF
 
 # define ON_DBG(m, x)	do { \