lxc-init: non-functional changes

This patch mainly update the message format to:

* upper the first letter
* end without a dot

all changes are relate to `lxc-init`

Signed-off-by: Long Wang <w@laoqinren.net>

diff --git a/src/lxc/error.c b/src/lxc/error.c
index b7fb687fe74daa338bf64af43b7615f075887406..81d6a376e825942fddba4958dfb82faec7643c5c 100644 (file)
--- a/src/lxc/error.c
+++ b/src/lxc/error.c
@@ -46,12 +46,12 @@ extern int  lxc_error_set_and_log(int pid, int status)
        if (WIFEXITED(status)) {
                ret = WEXITSTATUS(status);
                if (ret)
-                       INFO("Child <%d> ended on error (%d).", pid, ret);
+                       INFO("Child <%d> ended on error (%d)", pid, ret);
        }
 
        if (WIFSIGNALED(status)) {
                int signal = WTERMSIG(status);
-               INFO("Child <%d> ended on signal (%d).", pid, signal);
+               INFO("Child <%d> ended on signal (%d)", pid, signal);
        }
 
        return ret;

diff --git a/src/lxc/initutils.c b/src/lxc/initutils.c
index 8d9016cd01c7b442b061dbcacbc99d61bf304e2b..c190d6d50a6905619a8b5913929357c9cd1ab02b 100644 (file)
--- a/src/lxc/initutils.c
+++ b/src/lxc/initutils.c
@@ -30,10 +30,10 @@ static int mount_fs(const char *source, const char *target, const char *type)
 {
        /* the umount may fail */
        if (umount(target))
-               WARN("failed to unmount %s : %s", target, strerror(errno));
+               WARN("Failed to unmount %s : %s", target, strerror(errno));
 
        if (mount(source, target, type, 0, NULL)) {
-               ERROR("failed to mount %s : %s", target, strerror(errno));
+               ERROR("Failed to mount %s : %s", target, strerror(errno));
                return -1;
        }
 
@@ -45,26 +45,26 @@ static int mount_fs(const char *source, const char *target, const char *type)
 extern void lxc_setup_fs(void)
 {
        if (mount_fs("proc", "/proc", "proc"))
-               INFO("failed to remount proc");
+               INFO("Failed to remount proc");
 
        /* if /dev has been populated by us, /dev/shm does not exist */
        if (access("/dev/shm", F_OK) && mkdir("/dev/shm", 0777))
-               INFO("failed to create /dev/shm");
+               INFO("Failed to create /dev/shm");
 
        /* if we can't mount /dev/shm, continue anyway */
        if (mount_fs("shmfs", "/dev/shm", "tmpfs"))
-               INFO("failed to mount /dev/shm");
+               INFO("Failed to mount /dev/shm");
 
        /* If we were able to mount /dev/shm, then /dev exists */
        /* Sure, but it's read-only per config :) */
        if (access("/dev/mqueue", F_OK) && mkdir("/dev/mqueue", 0666)) {
-               DEBUG("failed to create '/dev/mqueue'");
+               DEBUG("Failed to create '/dev/mqueue'");
                return;
        }
 
        /* continue even without posix message queue support */
        if (mount_fs("mqueue", "/dev/mqueue", "mqueue"))
-               INFO("failed to mount /dev/mqueue");
+               INFO("Failed to mount /dev/mqueue");
 }
 
 static char *copy_global_config_value(char *p)

diff --git a/src/lxc/tools/lxc_init.c b/src/lxc/tools/lxc_init.c
index 07ef696409ab02ef841bc5a87416e55640011f4a..aeb1bba292bcd945d41c1f14fc847ca6765e752d 100644 (file)
--- a/src/lxc/tools/lxc_init.c
+++ b/src/lxc/tools/lxc_init.c
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
        lxc_log_options_no_override();
 
        if (!argv[optind]) {
-               ERROR("missing command to launch");
+               ERROR("Missing command to launch");
                exit(EXIT_FAILURE);
        }
 
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
            sigdelset(&mask, SIGSEGV) ||
            sigdelset(&mask, SIGBUS) ||
            sigprocmask(SIG_SETMASK, &mask, &omask)) {
-               SYSERROR("failed to set signal mask");
+               SYSERROR("Failed to set signal mask");
                exit(EXIT_FAILURE);
        }
 
@@ -160,14 +160,14 @@ int main(int argc, char *argv[])
                    sigdelset(&act.sa_mask, SIGBUS) ||
                    sigdelset(&act.sa_mask, SIGSTOP) ||
                    sigdelset(&act.sa_mask, SIGKILL)) {
-                       ERROR("failed to set signal");
+                       ERROR("Failed to set signal");
                        exit(EXIT_FAILURE);
                }
 
                act.sa_flags = 0;
                act.sa_handler = interrupt_handler;
                if (sigaction(i, &act, NULL) && errno != EINVAL) {
-                       SYSERROR("failed to sigaction");
+                       SYSERROR("Failed to sigaction");
                        exit(EXIT_FAILURE);
                }
        }
@@ -175,32 +175,30 @@ int main(int argc, char *argv[])
        lxc_setup_fs();
 
        pid = fork();
-
        if (pid < 0)
                exit(EXIT_FAILURE);
 
        if (!pid) {
-
                /* restore default signal handlers */
                for (i = 1; i < NSIG; i++)
                        signal(i, SIG_DFL);
 
                if (sigprocmask(SIG_SETMASK, &omask, NULL)) {
-                       SYSERROR("failed to set signal mask");
+                       SYSERROR("Failed to set signal mask");
                        exit(EXIT_FAILURE);
                }
 
-               NOTICE("about to exec '%s'", aargv[0]);
+               NOTICE("About to exec '%s'", aargv[0]);
 
                execvp(aargv[0], aargv);
-               ERROR("failed to exec: '%s' : %s", aargv[0], strerror(errno));
+               ERROR("Failed to exec: '%s' : %s", aargv[0], strerror(errno));
                exit(err);
        }
 
        /* let's process the signals now */
        if (sigdelset(&omask, SIGALRM) ||
            sigprocmask(SIG_SETMASK, &omask, NULL)) {
-               SYSERROR("failed to set signal mask");
+               SYSERROR("Failed to set signal mask");
                exit(EXIT_FAILURE);
        }
 
@@ -214,10 +212,8 @@ int main(int argc, char *argv[])
                pid_t waited_pid;
 
                switch (was_interrupted) {
-
                case 0:
                        break;
-
                case SIGPWR:
                case SIGTERM:
                        if (!shutdown) {
@@ -226,11 +222,9 @@ int main(int argc, char *argv[])
                                alarm(1);
                        }
                        break;
-
                case SIGALRM:
                        kill(-1, SIGKILL);
                        break;
-
                default:
                        kill(pid, was_interrupted);
                        break;
@@ -244,7 +238,7 @@ int main(int argc, char *argv[])
                        if (errno == EINTR)
                                continue;
 
-                       ERROR("failed to wait child : %s",
+                       ERROR("Failed to wait child : %s",
                              strerror(errno));
                        goto out;
                }