[CRIU] [PATCH 21/28] dump: few small cleanups

[Kinsbursky Stanislav]

From: Stanislav Kinsbursky <skinsbursky at openvz.org>

Signed-off-by: Stanislav Kinsbursky <skinsbursky at openvz.org>
---
 cr-dump.c |    8 +-------
 cr-show.c |    6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)
-------------- next part --------------
diff --git a/cr-dump.c b/cr-dump.c
index bdc0fe0..ff08ce3 100644
--- a/cr-dump.c
+++ b/cr-dump.c
@@ -184,9 +184,7 @@ static int dump_task_special_files(pid_t pid, const struct cr_fdset *cr_fdset)
 	fd = open_proc(pid, "exe");
 	if (fd < 0)
 		return -1;
-	ret = dump_one_reg_file(&fe, pid, fd, 0, cr_fdset, 1);
-
-	return ret;
+	return dump_one_reg_file(&fe, pid, fd, 0, cr_fdset, 1);
 }
 
 static int dump_pipe_and_data(int lfd, struct pipe_entry *e,
@@ -301,11 +299,7 @@ static int fill_file_entry(pid_t pid, const char *fd, struct file_entry *p)
 		return -1;
 	}
 
-	pr_info("%d fdinfo %s: pos: %16lx flags: %16o\n",
-		pid, fd, p->pos, p->flags);
-
 	p->id	= FD_ID_INVALID;
-
 	return 0;
 }
 
diff --git a/cr-show.c b/cr-show.c
index 4a016dc..76cc137 100644
--- a/cr-show.c
+++ b/cr-show.c
@@ -67,9 +67,9 @@ static void show_files(int fd_files)
 		if (ret <= 0)
 			goto out;
 
-		pr_msg("type: %02x len: %02x flags: %4x pos: %8x "
-		       "addr: %16lx id: %16lx",
-		       e.fde.type, e.len, e.flags, e.pos, e.addr, e.fde.id);
+		pr_msg("type: %02x id: %16lx len: %02x flags: %4x pos: %8x "
+		       "addr: %16lx",
+		       e.fde.type, e.fde.id, e.len, e.flags, e.pos, e.addr);
 
 		if (e.len) {
 			int ret = read(fd_files, local_buf, e.len);