[CRIU] [PATCH] pr_err: add \n where we miss them

Pavel Tikhomirov ptikhomirov at virtuozzo.com
Thu Dec 7 12:52:49 MSK 2017


Except for several false positives done by:
find -type f -name "*.c" -not -path "./test/*" -exec sed -i
's/\(\<pr_err.*[^\][^n]\)\("[,)]\)/\1\\n\2/g' {} \;

Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 compel/arch/s390/src/lib/cpu.c | 2 +-
 criu/arch/s390/cpu.c           | 2 +-
 criu/arch/x86/crtools.c        | 4 ++--
 criu/net.c                     | 4 ++--
 criu/page-xfer.c               | 4 ++--
 criu/util.c                    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compel/arch/s390/src/lib/cpu.c b/compel/arch/s390/src/lib/cpu.c
index 174575f93..b5c066c90 100644
--- a/compel/arch/s390/src/lib/cpu.c
+++ b/compel/arch/s390/src/lib/cpu.c
@@ -25,7 +25,7 @@ int compel_cpuid(compel_cpuinfo_t *info)
 	info->hwcap[1] = getauxval(AT_HWCAP2);
 
 	if (!info->hwcap[0]) {
-		pr_err("Can't read the hardware capabilities");
+		pr_err("Can't read the hardware capabilities\n");
 		return -1;
 	}
 
diff --git a/criu/arch/s390/cpu.c b/criu/arch/s390/cpu.c
index 0c32de5ab..f93666ed6 100644
--- a/criu/arch/s390/cpu.c
+++ b/criu/arch/s390/cpu.c
@@ -103,7 +103,7 @@ int cpu_validate_cpuinfo(void)
 		goto error;
 
 	if (cpu_info->n_s390_entry != 1) {
-		pr_err("No S390 related entry in image");
+		pr_err("No S390 related entry in image\n");
 		goto error;
 	}
 	cpu_s390_entry = cpu_info->s390_entry[0];
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index af5a315ad..69de23b44 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -59,7 +59,7 @@ int kdat_can_map_vdso(void)
 	}
 
 	if (waitpid(child, &stat, 0) != child) {
-		pr_err("Failed to wait for arch_prctl() test");
+		pr_err("Failed to wait for arch_prctl() test\n");
 		kill(child, SIGKILL);
 		return -1;
 	}
@@ -154,7 +154,7 @@ static int has_32bit_mmap_bug(void)
 		mmap_bug_test();
 
 	if (waitpid(child, &stat, 0) != child) {
-		pr_err("Failed to wait for mmap test");
+		pr_err("Failed to wait for mmap test\n");
 		kill(child, SIGKILL);
 		return -1;
 	}
diff --git a/criu/net.c b/criu/net.c
index 618909eea..3524585eb 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -1234,7 +1234,7 @@ static int veth_peer_info(struct net_link *link, struct newlink_req *req,
 		return 0;
 	}
 out:
-	pr_err("Unknown peer net namespace");
+	pr_err("Unknown peer net namespace\n");
 	return -1;
 }
 
@@ -1694,7 +1694,7 @@ static int restore_links()
 		if (nrcreated == nrlinks)
 			break;
 		if (nrcreated == 0) {
-			pr_err("Unable to restore network links");
+			pr_err("Unable to restore network links\n");
 			return -1;
 		}
 	}
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 8e7aa087b..9ae211614 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -223,7 +223,7 @@ static int write_pages_loc(struct page_xfer *xfer,
 			return -1;
 		}
 		if (ret == 0) {
-			pr_err("A pipe was closed unexpectedly");
+			pr_err("A pipe was closed unexpectedly\n");
 			return -1;
 		}
 		curr += ret;
@@ -704,7 +704,7 @@ static int page_server_add(int sk, struct page_server_iov *pi, u32 flags)
 			return -1;
 		}
 		if (chunk == 0) {
-			pr_err("A socket was closed unexpectedly");
+			pr_err("A socket was closed unexpectedly\n");
 			return -1;
 		}
 
diff --git a/criu/util.c b/criu/util.c
index eb5ed7336..80c40c6ec 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1484,7 +1484,7 @@ int call_in_child_process(int (*fn)(void *), void *arg)
 	}
 	errno = 0;
 	if (waitpid(pid, &status, __WALL) != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
-		pr_err("Can't wait or bad status: errno=%d, status=%d", errno, status);
+		pr_err("Can't wait or bad status: errno=%d, status=%d\n", errno, status);
 		goto out;
 	}
 	ret = 0;
-- 
2.13.6



More information about the CRIU mailing list