libfdisk: use new debug functions

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

1 files changed, 16 insertions, 16 deletions

diff --git a/libfdisk/src/alignment.c b/libfdisk/src/alignment.c
index b0cd30e14..da6be8fb3 100644
--- a/libfdisk/src/alignment.c
+++ b/libfdisk/src/alignment.c
@@ -75,7 +75,7 @@ sector_t fdisk_align_lba(struct fdisk_context *cxt, sector_t lba, int direction)
 	}
 
 	if (lba != res)
-		DBG(TOPOLOGY, dbgprint("LBA %ju -aligned-to-> %ju",
+		DBG(TOPOLOGY, ul_debug("LBA %ju -aligned-to-> %ju",
 				(uintmax_t) lba,
 				(uintmax_t) res));
 	return res;
@@ -160,7 +160,7 @@ int fdisk_override_geometry(struct fdisk_context *cxt,
 
 	fdisk_reset_alignment(cxt);
 
-	DBG(GEOMETRY, dbgprint("override C/H/S: %u/%u/%u",
+	DBG(GEOMETRY, ul_debug("override C/H/S: %u/%u/%u",
 		(unsigned) cxt->geom.cylinders,
 		(unsigned) cxt->geom.heads,
 		(unsigned) cxt->geom.sectors));
@@ -183,7 +183,7 @@ int fdisk_save_user_geometry(struct fdisk_context *cxt,
 	if (cylinders)
 		cxt->user_geom.cylinders = cylinders;
 
-	DBG(GEOMETRY, dbgprint("user C/H/S: %u/%u/%u",
+	DBG(GEOMETRY, ul_debug("user C/H/S: %u/%u/%u",
 				(unsigned) cxt->user_geom.cylinders,
 				(unsigned) cxt->user_geom.heads,
 				(unsigned) cxt->user_geom.sectors));
@@ -198,7 +198,7 @@ int fdisk_save_user_sector_size(struct fdisk_context *cxt,
 	if (!cxt)
 		return -EINVAL;
 
-	DBG(TOPOLOGY, dbgprint("user phy/log sector size: %u/%u", phy, log));
+	DBG(TOPOLOGY, ul_debug("user phy/log sector size: %u/%u", phy, log));
 
 	cxt->user_pyh_sector = phy;
 	cxt->user_log_sector = log;
@@ -220,7 +220,7 @@ int fdisk_apply_user_device_properties(struct fdisk_context *cxt)
 	if (!cxt)
 		return -EINVAL;
 
-	DBG(TOPOLOGY, dbgprint("appling user device properties"));
+	DBG(TOPOLOGY, ul_debug("appling user device properties"));
 
 	if (cxt->user_pyh_sector)
 		cxt->phy_sector_size = cxt->user_pyh_sector;
@@ -240,11 +240,11 @@ int fdisk_apply_user_device_properties(struct fdisk_context *cxt)
 
 	fdisk_reset_alignment(cxt);
 
-	DBG(GEOMETRY, dbgprint("new C/H/S: %u/%u/%u",
+	DBG(GEOMETRY, ul_debug("new C/H/S: %u/%u/%u",
 		(unsigned) cxt->geom.cylinders,
 		(unsigned) cxt->geom.heads,
 		(unsigned) cxt->geom.sectors));
-	DBG(TOPOLOGY, dbgprint("new log/phy sector size: %u/%u",
+	DBG(TOPOLOGY, ul_debug("new log/phy sector size: %u/%u",
 		(unsigned) cxt->sector_size,
 		(unsigned) cxt->phy_sector_size));
 
@@ -276,7 +276,7 @@ int fdisk_reset_device_properties(struct fdisk_context *cxt)
 	if (!cxt)
 		return -EINVAL;
 
-	DBG(TOPOLOGY, dbgprint("*** reseting device properties"));
+	DBG(TOPOLOGY, ul_debug("*** reseting device properties"));
 
 	fdisk_zeroize_device_properties(cxt);
 	fdisk_discover_topology(cxt);
@@ -300,7 +300,7 @@ int fdisk_discover_geometry(struct fdisk_context *cxt)
 	assert(cxt);
 	assert(cxt->geom.heads == 0);
 
-	DBG(GEOMETRY, dbgprint("%s: discovering geometry...", cxt->dev_path));
+	DBG(GEOMETRY, ul_debug("%s: discovering geometry...", cxt->dev_path));
 
 	/* get number of 512-byte sectors, and convert it the real sectors */
 	if (!blkdev_get_sectors(cxt->dev_fd, &nsects))
@@ -312,7 +312,7 @@ int fdisk_discover_geometry(struct fdisk_context *cxt)
 	/* obtained heads and sectors */
 	recount_geometry(cxt);
 
-	DBG(GEOMETRY, dbgprint("result: C/H/S: %u/%u/%u",
+	DBG(GEOMETRY, ul_debug("result: C/H/S: %u/%u/%u",
 			       (unsigned) cxt->geom.cylinders,
 			       (unsigned) cxt->geom.heads,
 			       (unsigned) cxt->geom.sectors));
@@ -327,9 +327,9 @@ int fdisk_discover_topology(struct fdisk_context *cxt)
 	assert(cxt);
 	assert(cxt->sector_size == 0);
 
-	DBG(TOPOLOGY, dbgprint("%s: discovering topology...", cxt->dev_path));
+	DBG(TOPOLOGY, ul_debug("%s: discovering topology...", cxt->dev_path));
 #ifdef HAVE_LIBBLKID
-	DBG(TOPOLOGY, dbgprint("initialize libblkid prober"));
+	DBG(TOPOLOGY, ul_debug("initialize libblkid prober"));
 
 	pr = blkid_new_probe();
 	if (pr && blkid_probe_set_device(pr, cxt->dev_fd, 0, 0) == 0) {
@@ -361,9 +361,9 @@ int fdisk_discover_topology(struct fdisk_context *cxt)
 	if (!cxt->io_size)
 		cxt->io_size = cxt->sector_size;
 
-	DBG(TOPOLOGY, dbgprint("result: log/phy sector size: %ld/%ld",
+	DBG(TOPOLOGY, ul_debug("result: log/phy sector size: %ld/%ld",
 			cxt->sector_size, cxt->phy_sector_size));
-	 DBG(TOPOLOGY, dbgprint("result: fdisk/min/optimal io: %ld/%ld/%ld",
+	 DBG(TOPOLOGY, ul_debug("result: fdisk/min/optimal io: %ld/%ld/%ld",
 		       cxt->io_size, cxt->optimal_io_size, cxt->min_io_size));
 	return 0;
 }
@@ -473,7 +473,7 @@ int fdisk_reset_alignment(struct fdisk_context *cxt)
 	if (!cxt)
 		return -EINVAL;
 
-	DBG(TOPOLOGY, dbgprint("reseting alignment..."));
+	DBG(TOPOLOGY, ul_debug("reseting alignment..."));
 
 	/* default */
 	cxt->grain = fdisk_topology_get_grain(cxt);
@@ -484,7 +484,7 @@ int fdisk_reset_alignment(struct fdisk_context *cxt)
 	if (cxt->label && cxt->label->op->reset_alignment)
 		rc = cxt->label->op->reset_alignment(cxt);
 
-	DBG(TOPOLOGY, dbgprint("%s alignment reseted to: "
+	DBG(TOPOLOGY, ul_debug("%s alignment reseted to: "
 			    "first LBA=%ju, last LBA=%ju, grain=%lu [rc=%d]",
 			    cxt->label ? cxt->label->name : NULL,
 			    (uintmax_t) cxt->first_lba, (uintmax_t) cxt->last_lba,