Merge pull request #2534 from tcharding/checkpatch

Checkpatch

diff --combined src/lxc/cmd/lxc_usernsexec.c
index 107668273f0beb88eda548b39bb73d9aac96d1ea,69ba7a41e162c03116a3e3119a520cbbda6c4c0f..227b79212d3aa7d9d136be86aa26fb848d4e9b20
--- 1/src/lxc/cmd/lxc_usernsexec.c
--- 2/src/lxc/cmd/lxc_usernsexec.c
+++ b/src/lxc/cmd/lxc_usernsexec.c
@@@ -333,18 -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 +364,8 @@@
                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);
@@@ -375,8 -374,7 +374,8 @@@
  
                ret = unshare(flags);
                if (ret < 0) {
 -                      perror("unshare");
 +                      fprintf(stderr,
 +                              "Failed to unshare mount and user namespace\n");
                        return 1;
                }
                buf[0] = '1';
@@@ -395,18 -393,14 +394,18 @@@
  
                close(pipe_fds1[1]);
                close(pipe_fds2[0]);
-               return do_child((void*)argv);
+               return do_child((void *)argv);
        }
  
        close(pipe_fds1[1]);
        close(pipe_fds2[0]);
 -      if (lxc_read_nointr(pipe_fds1[0], buf, 1) < 1) {
 +      ret = lxc_read_nointr(pipe_fds1[0], buf, 1);
 +      if (ret < 0) {
                perror("read pipe");
                exit(EXIT_FAILURE);
 +      } else if (ret == 0) {
 +              fprintf(stderr, "Failed to read from pipe\n");
 +              exit(EXIT_FAILURE);
        }
  
        buf[0] = '1';
@@@ -418,8 -412,8 +417,8 @@@
                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);
        }