Merge pull request #2534 from tcharding/checkpatch

Checkpatch

diff --git a/src/lxc/cmd/lxc_init.c b/src/lxc/cmd/lxc_init.c
index 651e9cb16c5b4b4fb404fe121b971e97474706bb..7f47cbddb27f9050152127142e879145a1e77a47 100644 (file)
--- a/src/lxc/cmd/lxc_init.c
+++ b/src/lxc/cmd/lxc_init.c
@@ -54,7 +54,7 @@
 
 lxc_log_define(lxc_init, lxc);
 
-static sig_atomic_t was_interrupted = 0;
+static sig_atomic_t was_interrupted;
 
 static void interrupt_handler(int sig)
 {
@@ -336,7 +336,7 @@ int main(int argc, char *argv[])
                        sigerr = signal(i, SIG_DFL);
                        if (sigerr == SIG_ERR) {
                                SYSDEBUG("Failed to reset to default action "
-                                        "for signal \"%d\": %d", i, pid);
+                                        "for signal \"%d\": %d", i, pid);
                        }
                }
 
@@ -350,8 +350,8 @@ int main(int argc, char *argv[])
                if (sid < 0)
                        DEBUG("Failed to make child session leader");
 
-                if (ioctl(STDIN_FILENO, TIOCSCTTY, 0) < 0)
-                        DEBUG("Failed to set controlling terminal");
+               if (ioctl(STDIN_FILENO, TIOCSCTTY, 0) < 0)
+                       DEBUG("Failed to set controlling terminal");
 
                NOTICE("Exec'ing \"%s\"", my_args.argv[0]);
 
@@ -556,7 +556,7 @@ static int arguments_parse(struct arguments *args, int argc,
 
        /* Check the command options */
        if (!args->name) {
-               if(!args->quiet)
+               if (!args->quiet)
                        fprintf(stderr, "lxc-init: missing container name, use --name option\n");
                return -1;
        }

diff --git a/src/lxc/cmd/lxc_monitord.c b/src/lxc/cmd/lxc_monitord.c
index 77be14defc5a49264adcb09b7b179901819014df..0b9d7fd013d5e9d77efb14a6987b61f0d09b5456 100644 (file)
--- a/src/lxc/cmd/lxc_monitord.c
+++ b/src/lxc/cmd/lxc_monitord.c
@@ -130,7 +130,8 @@ static int lxc_monitord_fifo_delete(struct lxc_monitor *mon)
        return 0;
 }
 
-static void lxc_monitord_sockfd_remove(struct lxc_monitor *mon, int fd) {
+static void lxc_monitord_sockfd_remove(struct lxc_monitor *mon, int fd)
+{
        int i;
 
        if (lxc_mainloop_del_handler(&mon->descr, fd))
@@ -175,7 +176,7 @@ static int lxc_monitord_sock_handler(int fd, uint32_t events, void *data,
 static int lxc_monitord_sock_accept(int fd, uint32_t events, void *data,
                                    struct lxc_epoll_descr *descr)
 {
-       int ret,clientfd;
+       int ret, clientfd;
        struct lxc_monitor *mon = data;
        struct ucred cred;
        socklen_t credsz = sizeof(cred);
@@ -301,7 +302,7 @@ static void lxc_monitord_delete(struct lxc_monitor *mon)
 static int lxc_monitord_fifo_handler(int fd, uint32_t events, void *data,
                                     struct lxc_epoll_descr *descr)
 {
-       int ret,i;
+       int ret, i;
        struct lxc_msg msglxc;
        struct lxc_monitor *mon = data;
 
@@ -315,7 +316,7 @@ static int lxc_monitord_fifo_handler(int fd, uint32_t events, void *data,
                ret = lxc_write_nointr(mon->clientfds[i], &msglxc, sizeof(msglxc));
                if (ret < 0)
                        SYSERROR("Failed to send message to client file descriptor %d",
-                                mon->clientfds[i]);
+                                mon->clientfds[i]);
        }
 
        return LXC_MAINLOOP_CONTINUE;
@@ -371,7 +372,7 @@ int main(int argc, char *argv[])
        }
 
        ret = snprintf(logpath, sizeof(logpath), "%s/lxc-monitord.log",
-                      (strcmp(LXCPATH, lxcpath) ? lxcpath : LOGPATH ));
+                      (strcmp(LXCPATH, lxcpath) ? lxcpath : LOGPATH));
        if (ret < 0 || ret >= sizeof(logpath))
                exit(EXIT_FAILURE);
 

diff --git a/src/lxc/cmd/lxc_usernsexec.c b/src/lxc/cmd/lxc_usernsexec.c
index 107668273f0beb88eda548b39bb73d9aac96d1ea..227b79212d3aa7d9d136be86aa26fb848d4e9b20 100644 (file)
--- a/src/lxc/cmd/lxc_usernsexec.c
+++ b/src/lxc/cmd/lxc_usernsexec.c
@@ -333,18 +333,18 @@ int main(int argc, char *argv[])
 
        while ((c = getopt(argc, argv, "m:h")) != EOF) {
                switch (c) {
-                       case 'm':
-                               if (parse_map(optarg)) {
-                                       usage(argv[0]);
-                                       exit(EXIT_FAILURE);
-                               }
-                               break;
-                       case 'h':
-                                 usage(argv[0]);
-                                 exit(EXIT_SUCCESS);
-                       default:
-                                 usage(argv[0]);
-                                 exit(EXIT_FAILURE);
+               case 'm':
+                       if (parse_map(optarg)) {
+                               usage(argv[0]);
+                               exit(EXIT_FAILURE);
+                       }
+                       break;
+               case 'h':
+                       usage(argv[0]);
+                       exit(EXIT_SUCCESS);
+               default:
+                       usage(argv[0]);
+                       exit(EXIT_FAILURE);
                }
        };
 
@@ -364,9 +364,8 @@ int main(int argc, char *argv[])
                perror("pipe");
                exit(EXIT_FAILURE);
        }
-       if ((pid = fork()) == 0) {
-               /* Child. */
-
+       pid = fork();
+       if (pid == 0) { /* Child. */
                close(pipe_fds1[0]);
                close(pipe_fds2[1]);
                opentty(ttyname0, 0);
@@ -395,7 +394,7 @@ int main(int argc, char *argv[])
 
                close(pipe_fds1[1]);
                close(pipe_fds2[0]);
-               return do_child((void*)argv);
+               return do_child((void *)argv);
        }
 
        close(pipe_fds1[1]);
@@ -418,8 +417,8 @@ int main(int argc, char *argv[])
                perror("write to pipe");
                exit(EXIT_FAILURE);
        }
-
-       if ((ret = waitpid(pid, &status, __WALL)) < 0) {
+       ret = waitpid(pid, &status, __WALL);
+       if (ret < 0) {
                printf("waitpid() returns %d, errno %d\n", ret, errno);
                exit(EXIT_FAILURE);
        }