misc: remove %p from debug messages

From libs where suid program may be executed by non-root user.

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

2 files changed, 25 insertions, 26 deletions

diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
index 1f1fc4515..83c3c4f1b 100644
--- a/libblkid/src/partitions/partitions.c
+++ b/libblkid/src/partitions/partitions.c
@@ -380,8 +380,7 @@ static blkid_partlist partitions_init_data(struct blkid_chain *chn)
 
 	reset_partlist(ls);
 
-	DBG(LOWPROBE, ul_debug("parts: initialized partitions list (%p, size=%d)",
-		ls, ls->nparts_max));
+	DBG(LOWPROBE, ul_debug("parts: initialized partitions list (size=%d)", ls->nparts_max));
 	return ls;
 }
 
@@ -416,7 +415,7 @@ blkid_parttable blkid_partlist_new_parttable(blkid_partlist ls,
 	list_add_tail(&tab->t_tabs, &ls->l_tabs);
 
 	DBG(LOWPROBE, ul_debug("parts: create a new partition table "
-		       "(%p, type=%s, offset=%"PRId64")", tab, type, offset));
+		       "(type=%s, offset=%"PRId64")", type, offset));
 	return tab;
 }
 
@@ -457,9 +456,9 @@ blkid_partition blkid_partlist_add_partition(blkid_partlist ls,
 	par->start = start;
 	par->size = size;
 
-	DBG(LOWPROBE, ul_debug("parts: add partition (%p start=%"
-		PRIu64 ", size=%" PRIu64 ", table=%p)",
-		par, par->start, par->size, tab));
+	DBG(LOWPROBE, ul_debug("parts: add partition (start=%"
+		PRIu64 ", size=%" PRIu64 ")",
+		par->start, par->size));
 	return par;
 }
 
@@ -666,8 +665,8 @@ int blkid_partitions_do_subprobe(blkid_probe pr, blkid_partition parent,
 	uint64_t sz, off;
 
 	DBG(LOWPROBE, ul_debug(
-		"parts: ----> %s subprobe requested (parent=%p)",
-		id->name, parent));
+		"parts: ----> %s subprobe requested)",
+		id->name));
 
 	if (!pr || !parent || !parent->size)
 		return -EINVAL;
@@ -713,8 +712,8 @@ int blkid_partitions_do_subprobe(blkid_probe pr, blkid_partition parent,
 	blkid_free_probe(prc);	/* free cloned prober */
 
 	DBG(LOWPROBE, ul_debug(
-		"parts: <---- %s subprobe done (parent=%p, rc=%d)",
-		id->name, parent, rc));
+		"parts: <---- %s subprobe done (rc=%d)",
+		id->name, rc));
 
 	return rc;
 }
diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 476461bc4..b8ffe466e 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -137,7 +137,7 @@ blkid_probe blkid_new_probe(void)
 	if (!pr)
 		return NULL;
 
-	DBG(LOWPROBE, ul_debug("allocate a new probe %p", pr));
+	DBG(LOWPROBE, ul_debug("allocate a new probe"));
 
 	/* initialize chains */
 	for (i = 0; i < BLKID_NCHAINS; i++) {
@@ -251,7 +251,7 @@ void blkid_free_probe(blkid_probe pr)
 	blkid_probe_reset_values(pr);
 	blkid_free_probe(pr->disk_probe);
 
-	DBG(LOWPROBE, ul_debug("free probe %p", pr));
+	DBG(LOWPROBE, ul_debug("free probe"));
 	free(pr);
 }
 
@@ -561,8 +561,8 @@ static struct blkid_bufinfo *read_buffer(blkid_probe pr, uint64_t real_off, uint
 	bf->off = real_off;
 	INIT_LIST_HEAD(&bf->bufs);
 
-	DBG(LOWPROBE, ul_debug("\tread %p: off=%"PRIu64" len=%"PRIu64"",
-	                       bf->data, real_off, len));
+	DBG(LOWPROBE, ul_debug("\tread: off=%"PRIu64" len=%"PRIu64"",
+	                       real_off, len));
 
 	ret = read(pr->fd, bf->data, len);
 	if (ret != (ssize_t) len) {
@@ -592,8 +592,8 @@ static struct blkid_bufinfo *get_cached_buffer(blkid_probe pr, uint64_t off, uin
 				list_entry(p, struct blkid_bufinfo, bufs);
 
 		if (real_off >= x->off && real_off + len <= x->off + x->len) {
-			DBG(BUFFER, ul_debug("\treuse %p: off=%"PRIu64" len=%"PRIu64" (for off=%"PRIu64" len=%"PRIu64")",
-						x->data, x->off, x->len, real_off, len));
+			DBG(BUFFER, ul_debug("\treuse: off=%"PRIu64" len=%"PRIu64" (for off=%"PRIu64" len=%"PRIu64")",
+						x->off, x->len, real_off, len));
 			return x;
 		}
 	}
@@ -625,8 +625,8 @@ static int hide_buffer(blkid_probe pr, uint64_t off, uint64_t len)
 
 			data = real_off ? x->data + (real_off - x->off) : x->data;
 
-			DBG(BUFFER, ul_debug("\thidding %p: off=%"PRIu64" len=%"PRIu64,
-						x->data, off, len));
+			DBG(BUFFER, ul_debug("\thidding: off=%"PRIu64" len=%"PRIu64,
+						off, len));
 			memset(data, 0, len);
 			ct++;
 		}
@@ -712,7 +712,7 @@ int blkid_probe_reset_buffers(blkid_probe pr)
 	if (list_empty(&pr->buffers))
 		return 0;
 
-	DBG(BUFFER, ul_debug("Resetting probing buffers pr=%p", pr));
+	DBG(BUFFER, ul_debug("Resetting probing buffers"));
 
 	while (!list_empty(&pr->buffers)) {
 		struct blkid_bufinfo *bf = list_entry(pr->buffers.next,
@@ -721,8 +721,8 @@ int blkid_probe_reset_buffers(blkid_probe pr)
 		len += bf->len;
 		list_del(&bf->bufs);
 
-		DBG(BUFFER, ul_debug(" remove buffer: %p [off=%"PRIu64", len=%"PRIu64"]",
-		                     bf->data, bf->off, bf->len));
+		DBG(BUFFER, ul_debug(" remove buffer: [off=%"PRIu64", len=%"PRIu64"]",
+		                     bf->off, bf->len));
 		free(bf);
 	}
 
@@ -765,7 +765,7 @@ static void blkid_probe_reset_values(blkid_probe pr)
 	if (list_empty(&pr->values))
 		return;
 
-	DBG(LOWPROBE, ul_debug("resetting results pr=%p", pr));
+	DBG(LOWPROBE, ul_debug("resetting results"));
 
 	while (!list_empty(&pr->values)) {
 		struct blkid_prval *v = list_entry(pr->values.next,
@@ -964,9 +964,9 @@ int blkid_probe_get_dimension(blkid_probe pr, uint64_t *off, uint64_t *size)
 int blkid_probe_set_dimension(blkid_probe pr, uint64_t off, uint64_t size)
 {
 	DBG(LOWPROBE, ul_debug(
-		"changing probing area pr=%p: size=%"PRIu64", off=%"PRIu64" "
+		"changing probing area: size=%"PRIu64", off=%"PRIu64" "
 		"-to-> size=%"PRIu64", off=%"PRIu64"",
-		pr, pr->size, pr->off, size, off));
+		pr->size, pr->off, size, off));
 
 	pr->off = off;
 	pr->size = size;
@@ -1029,7 +1029,7 @@ int blkid_probe_get_idmag(blkid_probe pr, const struct blkid_idinfo *id,
 
 static inline void blkid_probe_start(blkid_probe pr)
 {
-	DBG(LOWPROBE, ul_debug("%p: start probe", pr));
+	DBG(LOWPROBE, ul_debug("start probe"));
 	pr->cur_chain = NULL;
 	pr->prob_flags = 0;
 	blkid_probe_set_wiper(pr, 0, 0);
@@ -1037,7 +1037,7 @@ static inline void blkid_probe_start(blkid_probe pr)
 
 static inline void blkid_probe_end(blkid_probe pr)
 {
-	DBG(LOWPROBE, ul_debug("%p: end probe", pr));
+	DBG(LOWPROBE, ul_debug("end probe"));
 	pr->cur_chain = NULL;
 	pr->prob_flags = 0;
 	blkid_probe_set_wiper(pr, 0, 0);