Use strerror(errno) instead of %m

src/lxc/arguments.c

@@ -258,7 +258,8 @@ int lxc_arguments_str_to_int(struct lxc_arguments *args, const char *str)
 	errno = 0;
 	val = strtol(str, &endptr, 10);
 	if (errno) {
-		lxc_error(args, "invalid statefd '%s' : %m", str);
+		lxc_error(args, "invalid statefd '%s' : %s", str,
+			  strerror(errno));
 		return -1;
 	}
 

src/lxc/caps.c

@@ -53,19 +53,19 @@ int lxc_caps_down(void)
 
 	caps = cap_get_proc();
 	if (!caps) {
-		ERROR("failed to cap_get_proc: %m");
+		ERROR("failed to cap_get_proc: %s", strerror(errno));
 		return -1;
 	}
 
 	ret = cap_clear_flag(caps, CAP_EFFECTIVE);
 	if (ret) {
-		ERROR("failed to cap_clear_flag: %m");
+		ERROR("failed to cap_clear_flag: %s", strerror(errno));
 		goto out;
 	}
 
 	ret = cap_set_proc(caps);
 	if (ret) {
-		ERROR("failed to cap_set_proc: %m");
+		ERROR("failed to cap_set_proc: %s", strerror(errno));
 		goto out;
 	}
 
@@ -87,7 +87,7 @@ int lxc_caps_up(void)
 
 	caps = cap_get_proc();
 	if (!caps) {
-		ERROR("failed to cap_get_proc: %m");
+		ERROR("failed to cap_get_proc: %s", strerror(errno));
 		return -1;
 	}
 
@@ -101,21 +101,22 @@ int lxc_caps_up(void)
 				INFO("Last supported cap was %d", cap-1);
 				break;
 			} else {
-				ERROR("failed to cap_get_flag: %m");
+				ERROR("failed to cap_get_flag: %s",
+				      strerror(errno));
 				goto out;
 			}
 		}
 
 		ret = cap_set_flag(caps, CAP_EFFECTIVE, 1, &cap, flag);
 		if (ret) {
-			ERROR("failed to cap_set_flag: %m");
+			ERROR("failed to cap_set_flag: %s", strerror(errno));
 			goto out;
 		}
 	}
 
 	ret = cap_set_proc(caps);
 	if (ret) {
-		ERROR("failed to cap_set_proc: %m");
+		ERROR("failed to cap_set_proc: %s", strerror(errno));
 		goto out;
 	}
 
@@ -139,22 +140,26 @@ int lxc_caps_init(void)
 		INFO("command is run as setuid root (uid : %d)", uid);
 
 		if (prctl(PR_SET_KEEPCAPS, 1)) {
-			ERROR("failed to 'PR_SET_KEEPCAPS': %m");
+			ERROR("failed to 'PR_SET_KEEPCAPS': %s",
+			      strerror(errno));
 			return -1;
 		}
 
 		if (setresgid(gid, gid, gid)) {
-			ERROR("failed to change gid to '%d': %m", gid);
+			ERROR("failed to change gid to '%d': %s", gid,
+			      strerror(errno));
 			return -1;
 		}
 
 		if (setresuid(uid, uid, uid)) {
-			ERROR("failed to change uid to '%d': %m", uid);
+			ERROR("failed to change uid to '%d': %s", uid,
+			      strerror(errno));
 			return -1;
 		}
 
 		if (lxc_caps_up()) {
-			ERROR("failed to restore capabilities: %m");
+			ERROR("failed to restore capabilities: %s",
+			      strerror(errno));
 			return -1;
 		}
 	}

src/lxc/conf.c

@@ -3001,9 +3001,9 @@ struct lxc_conf *lxc_conf_init(void)
 	struct lxc_conf *new;
 	int i;
 
-	new = 	malloc(sizeof(*new));
+	new = malloc(sizeof(*new));
 	if (!new) {
-		ERROR("lxc_conf_init : %m");
+		ERROR("lxc_conf_init : %s", strerror(errno));
 		return NULL;
 	}
 	memset(new, 0, sizeof(*new));
@@ -3024,7 +3024,7 @@ struct lxc_conf *lxc_conf_init(void)
 	new->maincmd_fd = -1;
 	new->rootfs.mount = strdup(default_rootfs_mount);
 	if (!new->rootfs.mount) {
-		ERROR("lxc_conf_init : %m");
+		ERROR("lxc_conf_init : %s", strerror(errno));
 		free(new);
 		return NULL;
 	}

src/lxc/lxc_init.c

@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
 		NOTICE("about to exec '%s'", aargv[0]);
 
 		execvp(aargv[0], aargv);
-		ERROR("failed to exec: '%s' : %m", aargv[0]);
+		ERROR("failed to exec: '%s' : %s", aargv[0], strerror(errno));
 		exit(err);
 	}
 

src/lxc/start.c

@@ -195,7 +195,7 @@ int lxc_check_inherited(struct lxc_conf *conf, int fd_to_ignore)
 restart:
 	dir = opendir("/proc/self/fd");
 	if (!dir) {
-		WARN("failed to open directory: %m");
+		WARN("Failed to open directory: %s.", strerror(errno));
 		return -1;
 	}
 
@@ -584,7 +584,7 @@ static int must_drop_cap_sys_boot(struct lxc_conf *conf)
 		return -1;
 	}
 	if (wait(&status) < 0) {
-		SYSERROR("unexpected wait error: %m");
+		SYSERROR("Unexpected wait error: %s.", strerror(errno));
 		return -1;
 	}
 

src/lxc/sync.c

@@ -40,7 +40,7 @@ static int __sync_wait(int fd, int sequence)
 
 	ret = read(fd, &sync, sizeof(sync));
 	if (ret < 0) {
-		ERROR("sync wait failure : %m");
+		ERROR("sync wait failure : %s", strerror(errno));
 		return -1;
 	}
 
@@ -71,7 +71,7 @@ static int __sync_wake(int fd, int sequence)
 	int sync = sequence;
 
 	if (write(fd, &sync, sizeof(sync)) < 0) {
-		ERROR("sync wake failure : %m");
+		ERROR("sync wake failure : %s", strerror(errno));
 		return -1;
 	}
 	return 0;

src/tests/reboot.c

@@ -21,6 +21,8 @@
 #include <sched.h>
 #include <unistd.h>
 #include <signal.h>
+#include <errno.h>
+#include <string.h>
 #include <sys/reboot.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -38,7 +40,7 @@ static int do_reboot(void *arg)
 	int *cmd = arg;
 
 	if (reboot(*cmd))
-		printf("failed to reboot(%d): %m\n", *cmd);
+		printf("failed to reboot(%d): %s\n", *cmd, strerror(errno));
 	return 0;
 }
 
@@ -51,12 +53,12 @@ static int test_reboot(int cmd, int sig)
 
 	ret = clone(do_reboot, stack, CLONE_NEWPID | SIGCHLD, &cmd);
 	if (ret < 0) {
-		printf("failed to clone: %m\n");
+		printf("failed to clone: %s\n", strerror(errno));
 		return -1;
 	}
 
 	if (wait(&status) < 0) {
-		printf("unexpected wait error: %m\n");
+		printf("unexpected wait error: %s\n", strerror(errno));
 		return -1;
 	}