[CRIU] [PATCH 2/2] output: add "0x" to hex prints manually

[Kinsbursky Stanislav]

From: Stanislav Kinsbursky <skinsbursky at openvz.org>

Signed-off-by: Stanislav Kinsbursky <skinsbursky at openvz.org>
---
 cr-show.c |   12 ++++++------
 sockets.c |    2 +-
 util.c    |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
-------------- next part --------------
diff --git a/cr-show.c b/cr-show.c
index f95e2f2..cf6471c 100644
--- a/cr-show.c
+++ b/cr-show.c
@@ -35,9 +35,9 @@
 
 #define pr_regs4(s, n1, n2, n3, n4)	\
 	pr_msg("%8s: 0x%16lx "		\
-	       "%8s: %16lx "		\
-	       "%8s: %16lx "		\
-	       "%8s: %16lx\n",		\
+	       "%8s: 0x%16lx "		\
+	       "%8s: 0x%16lx "		\
+	       "%8s: 0x%16lx\n",	\
 	       #n1, s.n1,		\
 	       #n2, s.n2,		\
 	       #n3, s.n3,		\
@@ -45,8 +45,8 @@
 
 #define pr_regs3(s, n1, n2, n3)		\
 	pr_msg("%8s: 0x%16lx "		\
-	       "%8s: %16lx "		\
-	       "%8s: %16lx\n",		\
+	       "%8s: 0x%16lx "		\
+	       "%8s: 0x%16lx\n",	\
 	       #n1, s.n1,		\
 	       #n2, s.n2,		\
 	       #n3, s.n3)
@@ -326,7 +326,7 @@ void show_sigacts(int fd_sigacts, struct cr_options *o)
 		if (ret <= 0)
 			goto out;
 		pr_msg("sigaction: 0x%016lx mask: 0x%08lx "
-		       "flags: %016lx restorer: %016lx\n",
+		       "flags: 0x%016lx restorer: 0x%016lx\n",
 		       (long)e.sigaction,
 		       (long)e.mask,
 		       (long)e.flags,
diff --git a/sockets.c b/sockets.c
index 3f04854..6bc2fd3 100644
--- a/sockets.c
+++ b/sockets.c
@@ -587,7 +587,7 @@ static int unix_collect_one(const struct unix_diag_msg *m,
 			    (st.st_dev != kdev_to_odev(uv->udiag_vfs_dev))) {
 				pr_info("unix: Dropping path for "
 						"unlinked bound "
-						"sk %x.%x real %x.%x\n",
+						"sk 0x%x.0x%x real 0x%x.0x%x\n",
 						(int)st.st_dev,
 						(int)st.st_ino,
 						(int)uv->udiag_vfs_dev,
diff --git a/util.c b/util.c
index 6b9ebc7..0554180 100644
--- a/util.c
+++ b/util.c
@@ -42,8 +42,8 @@ void pr_vma(unsigned int loglevel, const struct vma_area *vma_area)
 	if (!vma_area)
 		return;
 
-	print_on_level(loglevel, "s: %16lx e: %16lx l: %8liK p: %8x f: %8x pg: %8lx "
-		       "vf: %s st: %s spc: %-8s shmid: %8lx\n",
+	print_on_level(loglevel, "s: 0x%16lx e: 0x%16lx l: %8liK p: 0x%8x f: 0x%8x pg: 0x%8lx "
+		       "vf: %s st: %s spc: %-8s shmid: 0x%8lx\n",
 		       vma_area->vma.start, vma_area->vma.end,
 		       KBYTES(vma_area_len(vma_area)),
 		       vma_area->vma.prot,