libfdisk: use new debug functions

[thirdparty/util-linux.git] / disk-utils / fdisk-menu.c

diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c
index d7b852deb7216dd17d3d8ec203a3ce21765272d7..822761568168c3086e9cd884cf7c5f4dfe17bc9b 100644 (file)
--- a/disk-utils/fdisk-menu.c
+++ b/disk-utils/fdisk-menu.c
@@ -325,15 +325,15 @@ static int menu_detect_collisions(struct fdisk_context *cxt)
 
                r = get_fdisk_menu_entry(cxt, e->key, NULL);
                if (!r) {
-                       DBG(FRONTEND, dbgprint("warning: not found "
+                       DBG(FRONTEND, ul_debug("warning: not found "
                                        "entry for %c", e->key));
                        return -1;
                }
                if (r != e) {
-                       DBG(FRONTEND, dbgprint("warning: duplicate key '%c'",
+                       DBG(FRONTEND, ul_debug("warning: duplicate key '%c'",
                                                e->key));
-                       DBG(FRONTEND, dbgprint("       : %s", e->title));
-                       DBG(FRONTEND, dbgprint("       : %s", r->title));
+                       DBG(FRONTEND, ul_debug("       : %s", e->title));
+                       DBG(FRONTEND, ul_debug("       : %s", r->title));
                        abort();
                }
        }
@@ -414,18 +414,18 @@ int process_fdisk_menu(struct fdisk_context **cxt0)
        }
 
        rc = 0;
-       DBG(FRONTEND, dbgprint("selected: key=%c, entry='%s'",
+       DBG(FRONTEND, ul_debug("selected: key=%c, entry='%s'",
                                key, ent->title));
 
        /* menu has implemented callback, use it */
        if (menu->callback)
                rc = menu->callback(cxt0, menu, ent);
        else {
-               DBG(FRONTEND, dbgprint("no callback for key '%c'", key));
+               DBG(FRONTEND, ul_debug("no callback for key '%c'", key));
                rc = -EINVAL;
        }
 
-       DBG(FRONTEND, dbgprint("process menu done [rc=%d]", rc));
+       DBG(FRONTEND, ul_debug("process menu done [rc=%d]", rc));
        return rc;
 }
 
@@ -550,7 +550,7 @@ static int gpt_menu_cb(struct fdisk_context **cxt0,
        assert(ent);
        assert(fdisk_is_disklabel(cxt, GPT));
 
-       DBG(FRONTEND, dbgprint("enter GPT menu"));
+       DBG(FRONTEND, ul_debug("enter GPT menu"));
 
        if (ent->expert) {
                switch (ent->key) {
@@ -608,7 +608,7 @@ static int dos_menu_cb(struct fdisk_context **cxt0,
        struct fdisk_context *cxt = *cxt0;
        int rc = 0;
 
-       DBG(FRONTEND, dbgprint("enter DOS menu"));
+       DBG(FRONTEND, ul_debug("enter DOS menu"));
 
        if (!ent->expert) {
                switch (ent->key) {
@@ -681,13 +681,13 @@ static int sun_menu_cb(struct fdisk_context **cxt0,
        struct fdisk_context *cxt = *cxt0;
        int rc = 0;
 
-       DBG(FRONTEND, dbgprint("enter SUN menu"));
+       DBG(FRONTEND, ul_debug("enter SUN menu"));
 
        assert(cxt);
        assert(ent);
        assert(fdisk_is_disklabel(cxt, SUN));
 
-       DBG(FRONTEND, dbgprint("enter SUN menu"));
+       DBG(FRONTEND, ul_debug("enter SUN menu"));
 
        /* normal mode */
        if (!ent->expert) {
@@ -736,7 +736,7 @@ static int sgi_menu_cb(struct fdisk_context **cxt0,
        int rc = -EINVAL;
        size_t n = 0;
 
-       DBG(FRONTEND, dbgprint("enter SGI menu"));
+       DBG(FRONTEND, ul_debug("enter SGI menu"));
 
        assert(cxt);
        assert(ent);
@@ -782,7 +782,7 @@ static int bsd_menu_cb(struct fdisk_context **cxt0,
        assert(ent);
        assert(fdisk_is_disklabel(cxt, BSD));
 
-       DBG(FRONTEND, dbgprint("enter BSD menu"));
+       DBG(FRONTEND, ul_debug("enter BSD menu"));
 
        switch(ent->key) {
        case 'e':
@@ -814,7 +814,7 @@ static int geo_menu_cb(struct fdisk_context **cxt0,
        int rc = -EINVAL;
        uintmax_t c = 0, h = 0, s = 0;
 
-       DBG(FRONTEND, dbgprint("enter GEO menu"));
+       DBG(FRONTEND, ul_debug("enter GEO menu"));
 
        assert(cxt);
        assert(ent);
@@ -846,7 +846,7 @@ static int createlabel_menu_cb(struct fdisk_context **cxt0,
        struct fdisk_context *cxt = *cxt0;
        int rc = -EINVAL;
 
-       DBG(FRONTEND, dbgprint("enter Create label menu"));
+       DBG(FRONTEND, ul_debug("enter Create label menu"));
 
        assert(cxt);
        assert(ent);