Commit 2db65c21 by Tobin C. Harding

cmd: Fix whitespace ERRORS

checkpatch.pl emits a bunch of warnings about various whitespace issues. Fix all these as a single patch since they are all whitespace only changes. Fix whitespace issues found by checkpatch.pl Signed-off-by: 's avatarTobin C. Harding <me@tobin.cc>
parent 3c84faa3
...@@ -336,7 +336,7 @@ int main(int argc, char *argv[]) ...@@ -336,7 +336,7 @@ int main(int argc, char *argv[])
sigerr = signal(i, SIG_DFL); sigerr = signal(i, SIG_DFL);
if (sigerr == SIG_ERR) { if (sigerr == SIG_ERR) {
SYSDEBUG("Failed to reset to default action " 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[]) ...@@ -350,8 +350,8 @@ int main(int argc, char *argv[])
if (sid < 0) if (sid < 0)
DEBUG("Failed to make child session leader"); DEBUG("Failed to make child session leader");
if (ioctl(STDIN_FILENO, TIOCSCTTY, 0) < 0) if (ioctl(STDIN_FILENO, TIOCSCTTY, 0) < 0)
DEBUG("Failed to set controlling terminal"); DEBUG("Failed to set controlling terminal");
NOTICE("Exec'ing \"%s\"", my_args.argv[0]); NOTICE("Exec'ing \"%s\"", my_args.argv[0]);
...@@ -556,7 +556,7 @@ static int arguments_parse(struct arguments *args, int argc, ...@@ -556,7 +556,7 @@ static int arguments_parse(struct arguments *args, int argc,
/* Check the command options */ /* Check the command options */
if (!args->name) { if (!args->name) {
if(!args->quiet) if (!args->quiet)
fprintf(stderr, "lxc-init: missing container name, use --name option\n"); fprintf(stderr, "lxc-init: missing container name, use --name option\n");
return -1; return -1;
} }
......
...@@ -130,7 +130,8 @@ static int lxc_monitord_fifo_delete(struct lxc_monitor *mon) ...@@ -130,7 +130,8 @@ static int lxc_monitord_fifo_delete(struct lxc_monitor *mon)
return 0; 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; int i;
if (lxc_mainloop_del_handler(&mon->descr, fd)) 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, ...@@ -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, static int lxc_monitord_sock_accept(int fd, uint32_t events, void *data,
struct lxc_epoll_descr *descr) struct lxc_epoll_descr *descr)
{ {
int ret,clientfd; int ret, clientfd;
struct lxc_monitor *mon = data; struct lxc_monitor *mon = data;
struct ucred cred; struct ucred cred;
socklen_t credsz = sizeof(cred); socklen_t credsz = sizeof(cred);
...@@ -301,7 +302,7 @@ static void lxc_monitord_delete(struct lxc_monitor *mon) ...@@ -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, static int lxc_monitord_fifo_handler(int fd, uint32_t events, void *data,
struct lxc_epoll_descr *descr) struct lxc_epoll_descr *descr)
{ {
int ret,i; int ret, i;
struct lxc_msg msglxc; struct lxc_msg msglxc;
struct lxc_monitor *mon = data; struct lxc_monitor *mon = data;
...@@ -315,7 +316,7 @@ static int lxc_monitord_fifo_handler(int fd, uint32_t events, void *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)); ret = lxc_write_nointr(mon->clientfds[i], &msglxc, sizeof(msglxc));
if (ret < 0) if (ret < 0)
SYSERROR("Failed to send message to client file descriptor %d", SYSERROR("Failed to send message to client file descriptor %d",
mon->clientfds[i]); mon->clientfds[i]);
} }
return LXC_MAINLOOP_CONTINUE; return LXC_MAINLOOP_CONTINUE;
...@@ -371,7 +372,7 @@ int main(int argc, char *argv[]) ...@@ -371,7 +372,7 @@ int main(int argc, char *argv[])
} }
ret = snprintf(logpath, sizeof(logpath), "%s/lxc-monitord.log", 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)) if (ret < 0 || ret >= sizeof(logpath))
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
......
...@@ -394,7 +394,7 @@ int main(int argc, char *argv[]) ...@@ -394,7 +394,7 @@ int main(int argc, char *argv[])
close(pipe_fds1[1]); close(pipe_fds1[1]);
close(pipe_fds2[0]); close(pipe_fds2[0]);
return do_child((void*)argv); return do_child((void *)argv);
} }
close(pipe_fds1[1]); close(pipe_fds1[1]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment