Skip to content

L
lxc
Commit 0402866c by Stéphane Graber
Options

Fix indentation

I've noticed that a bunch of the code we've included over the past few weeks has been using 8-spaces rather than tabs, making it all very hard to read depending on your tabstop setting. This commit attempts to revert all of that back to proper tabs and fix a few more cases I've noticed here and there. No functional changes are included in this commit. Signed-off-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent d6e179bb
Showing with 192 additions and 192 deletions
src/lxc/caps.c
......@@ -71,7 +71,7 @@ int lxc_caps_down(void)
out:
cap_free(caps);
return 0;
return 0;
}
int lxc_caps_up(void)
......@@ -121,7 +121,7 @@ int lxc_caps_up(void)
out:
cap_free(caps);
return 0;
return 0;
}
int lxc_caps_init(void)
......
src/lxc/caps.h
......@@ -33,17 +33,17 @@ extern int lxc_caps_init(void);
extern int lxc_caps_last_cap(void);
#else
static inline int lxc_caps_down(void) {
return 0;
return 0;
}
static inline int lxc_caps_up(void) {
return 0;
return 0;
}
static inline int lxc_caps_init(void) {
return 0;
return 0;
}
static inline int lxc_caps_last_cap(void) {
return 0;
return 0;
}
#endif
......
src/lxc/cgmanager.c
......@@ -122,13 +122,13 @@ static void cull_user_controllers(void);
static void cgm_dbus_disconnect(void)
{
if (cgroup_manager) {
dbus_connection_flush(cgroup_manager->connection);
dbus_connection_close(cgroup_manager->connection);
nih_free(cgroup_manager);
}
cgroup_manager = NULL;
cgm_unlock();
if (cgroup_manager) {
dbus_connection_flush(cgroup_manager->connection);
dbus_connection_close(cgroup_manager->connection);
nih_free(cgroup_manager);
}
cgroup_manager = NULL;
cgm_unlock();
}
#define CGMANAGER_DBUS_SOCK "unix:path=/sys/fs/cgroup/cgmanager/sock"
......
src/lxc/confile.c
......@@ -1095,10 +1095,10 @@ static int config_group(const char *key, const char *value,
/* in case several groups are specified in a single line
* split these groups in a single element for the list */
for (groupptr = groups;;groupptr = NULL) {
token = strtok_r(groupptr, " \t", &sptr);
if (!token) {
token = strtok_r(groupptr, " \t", &sptr);
if (!token) {
ret = 0;
break;
break;
}
grouplist = malloc(sizeof(*grouplist));
......@@ -1115,7 +1115,7 @@ static int config_group(const char *key, const char *value,
}
lxc_list_add_tail(&lxc_conf->groups, grouplist);
}
}
free(groups);
......@@ -1450,10 +1450,10 @@ static int config_mount_auto(const char *key, const char *value,
}
for (autoptr = autos; ; autoptr = NULL) {
token = strtok_r(autoptr, " \t", &sptr);
if (!token) {
token = strtok_r(autoptr, " \t", &sptr);
if (!token) {
ret = 0;
break;
break;
}
for (i = 0; allowed_auto_mounts[i].token; i++) {
......@@ -1468,7 +1468,7 @@ static int config_mount_auto(const char *key, const char *value,
lxc_conf->auto_mounts &= ~allowed_auto_mounts[i].mask;
lxc_conf->auto_mounts |= allowed_auto_mounts[i].flag;
}
}
free(autos);
......@@ -1519,10 +1519,10 @@ static int config_cap_keep(const char *key, const char *value,
/* in case several capability keep is specified in a single line
* split these caps in a single element for the list */
for (keepptr = keepcaps;;keepptr = NULL) {
token = strtok_r(keepptr, " \t", &sptr);
if (!token) {
token = strtok_r(keepptr, " \t", &sptr);
if (!token) {
ret = 0;
break;
break;
}
keeplist = malloc(sizeof(*keeplist));
......@@ -1539,7 +1539,7 @@ static int config_cap_keep(const char *key, const char *value,
}
lxc_list_add_tail(&lxc_conf->keepcaps, keeplist);
}
}
free(keepcaps);
......@@ -1565,10 +1565,10 @@ static int config_cap_drop(const char *key, const char *value,
/* in case several capability drop is specified in a single line
* split these caps in a single element for the list */
for (dropptr = dropcaps;;dropptr = NULL) {
token = strtok_r(dropptr, " \t", &sptr);
if (!token) {
token = strtok_r(dropptr, " \t", &sptr);
if (!token) {
ret = 0;
break;
break;
}
droplist = malloc(sizeof(*droplist));
......@@ -1585,7 +1585,7 @@ static int config_cap_drop(const char *key, const char *value,
}
lxc_list_add_tail(&lxc_conf->caps, droplist);
}
}
free(dropcaps);
......@@ -1814,7 +1814,7 @@ int lxc_fill_elevated_privileges(char *flaglist, int *flags)
/* for the sake of backward compatibility, drop all privileges
if none is specified */
for (i = 0; all_privs[i].token; i++) {
*flags |= all_privs[i].flag;
*flags |= all_privs[i].flag;
}
return 0;
}
......
src/lxc/genl.c
......@@ -53,10 +53,10 @@ static int genetlink_resolve_family(const char *family)
request->nlmsghdr.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN);
request->nlmsghdr.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
request->nlmsghdr.nlmsg_type = GENL_ID_CTRL;
request->nlmsghdr.nlmsg_type = GENL_ID_CTRL;
genlmsghdr = NLMSG_DATA(&request->nlmsghdr);
genlmsghdr->cmd = CTRL_CMD_GETFAMILY;
genlmsghdr->cmd = CTRL_CMD_GETFAMILY;
ret = netlink_open(&handler, NETLINK_GENERIC);
if (ret)
......
src/lxc/genl.h
......@@ -59,7 +59,7 @@ struct genlmsg {
static inline int genetlink_len(const struct genlmsg *genlmsg)
{
return ((genlmsg->nlmsghdr.nlmsg_len) - GENL_HDRLEN - NLMSG_HDRLEN);
return ((genlmsg->nlmsghdr.nlmsg_len) - GENL_HDRLEN - NLMSG_HDRLEN);
}
/*
......
src/lxc/list.h
......@@ -72,10 +72,10 @@ static inline void __lxc_list_add(struct lxc_list *new,
struct lxc_list *prev,
struct lxc_list *next)
{
next->prev = new;
new->next = next;
new->prev = prev;
prev->next = new;
next->prev = new;
new->next = next;
new->prev = prev;
prev->next = new;
}
static inline void lxc_list_add(struct lxc_list *head, struct lxc_list *list)
......
src/lxc/lxc_attach.c
......@@ -113,12 +113,12 @@ static int my_parser(struct lxc_arguments* args, int c, char* arg)
/* -s implies -e */
lxc_fill_elevated_privileges(NULL, &elevated_privileges);
break;
case 500: /* clear-env */
env_policy = LXC_ATTACH_CLEAR_ENV;
break;
case 501: /* keep-env */
env_policy = LXC_ATTACH_KEEP_ENV;
break;
case 500: /* clear-env */
env_policy = LXC_ATTACH_CLEAR_ENV;
break;
case 501: /* keep-env */
env_policy = LXC_ATTACH_KEEP_ENV;
break;
case 502: /* keep-var */
ret = add_to_simple_array(&extra_keep, &extra_keep_size, arg);
if (ret < 0) {
......
src/lxc/lxc_init.c
......@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
aargv = &argv[optind];
/*
/*
* mask all the signals so we are safe to install a
* signal handler and to fork
*/
......
src/lxc/lxc_start.c
......@@ -190,7 +190,7 @@ Options :\n\
-L, --console-log=FILE Log container console output to FILE\n\
-C, --close-all-fds If any fds are inherited, close them\n\
If not specified, exit with failure instead\n\
Note: --daemon implies --close-all-fds\n\
Note: --daemon implies --close-all-fds\n\
-s, --define KEY=VAL Assign VAL to configuration variable KEY\n\
--share-[net|ipc|uts]=NAME Share a namespace with another container or pid\n\
",
......
src/lxc/lxc_unshare.c
......@@ -115,8 +115,8 @@ struct start_arg {
int *flags;
uid_t *uid;
bool setuid;
int want_default_mounts;
const char *want_hostname;
int want_default_mounts;
const char *want_hostname;
};
static int do_start(void *arg)
......
src/lxc/lxccontainer.c
......@@ -2603,7 +2603,7 @@ static int create_file_dirname(char *path, struct lxc_conf *conf)
if (!p)
return -1;
*p = '\0';
ret = do_create_container_dir(path, conf);
ret = do_create_container_dir(path, conf);
*p = '/';
return ret;
}
......
src/lxc/lxccontainer.h
......@@ -763,17 +763,17 @@ struct lxc_snapshot {
* \brief Specifications for how to create a new backing store
*/
struct bdev_specs {
char *fstype; /*!< Filesystem type */
uint64_t fssize; /*!< Filesystem size in bytes */
struct {
char *zfsroot; /*!< ZFS root path */
} zfs;
struct {
char *vg; /*!< LVM Volume Group name */
char *lv; /*!< LVM Logical Volume name */
char *thinpool; /*!< LVM thin pool to use, if any */
} lvm;
char *dir; /*!< Directory path */
char *fstype; /*!< Filesystem type */
uint64_t fssize; /*!< Filesystem size in bytes */
struct {
char *zfsroot; /*!< ZFS root path */
} zfs;
struct {
char *vg; /*!< LVM Volume Group name */
char *lv; /*!< LVM Logical Volume name */
char *thinpool; /*!< LVM thin pool to use, if any */
} lvm;
char *dir; /*!< Directory path */
};
/*!
......
src/lxc/nl.c
......@@ -74,7 +74,7 @@ extern int nla_put_buffer(struct nlmsg *nlmsg, int attr,
extern int nla_put_string(struct nlmsg *nlmsg, int attr, const char *string)
{
return nla_put(nlmsg, attr, string, strlen(string) + 1);
return nla_put(nlmsg, attr, string, strlen(string) + 1);
}
extern int nla_put_u32(struct nlmsg *nlmsg, int attr, int value)
......@@ -173,23 +173,23 @@ extern void nlmsg_free(struct nlmsg *nlmsg)
extern int netlink_rcv(struct nl_handler *handler, struct nlmsg *answer)
{
int ret;
struct sockaddr_nl nladdr;
struct iovec iov = {
.iov_base = answer->nlmsghdr,
.iov_len = answer->nlmsghdr->nlmsg_len,
};
struct sockaddr_nl nladdr;
struct iovec iov = {
.iov_base = answer->nlmsghdr,
.iov_len = answer->nlmsghdr->nlmsg_len,
};
struct msghdr msg = {
.msg_name = &nladdr,
.msg_namelen = sizeof(nladdr),
.msg_iov = &iov,
.msg_iovlen = 1,
};
.msg_name = &nladdr,
.msg_namelen = sizeof(nladdr),
.msg_iov = &iov,
.msg_iovlen = 1,
};
memset(&nladdr, 0, sizeof(nladdr));
nladdr.nl_family = AF_NETLINK;
nladdr.nl_pid = 0;
nladdr.nl_groups = 0;
memset(&nladdr, 0, sizeof(nladdr));
nladdr.nl_family = AF_NETLINK;
nladdr.nl_pid = 0;
nladdr.nl_groups = 0;
again:
ret = recvmsg(handler->fd, &msg, 0);
......@@ -211,23 +211,23 @@ again:
extern int netlink_send(struct nl_handler *handler, struct nlmsg *nlmsg)
{
struct sockaddr_nl nladdr;
struct iovec iov = {
.iov_base = nlmsg->nlmsghdr,
.iov_len = nlmsg->nlmsghdr->nlmsg_len,
};
struct sockaddr_nl nladdr;
struct iovec iov = {
.iov_base = nlmsg->nlmsghdr,
.iov_len = nlmsg->nlmsghdr->nlmsg_len,
};
struct msghdr msg = {
.msg_name = &nladdr,
.msg_namelen = sizeof(nladdr),
.msg_iov = &iov,
.msg_iovlen = 1,
};
.msg_name = &nladdr,
.msg_namelen = sizeof(nladdr),
.msg_iov = &iov,
.msg_iovlen = 1,
};
int ret;
memset(&nladdr, 0, sizeof(nladdr));
nladdr.nl_family = AF_NETLINK;
nladdr.nl_pid = 0;
nladdr.nl_groups = 0;
memset(&nladdr, 0, sizeof(nladdr));
nladdr.nl_family = AF_NETLINK;
nladdr.nl_pid = 0;
nladdr.nl_groups = 0;
ret = sendmsg(handler->fd, &msg, 0);
if (ret < 0)
......@@ -263,45 +263,45 @@ extern int netlink_transaction(struct nl_handler *handler,
extern int netlink_open(struct nl_handler *handler, int protocol)
{
socklen_t socklen;
int sndbuf = 32768;
int rcvbuf = 32768;
int sndbuf = 32768;
int rcvbuf = 32768;
memset(handler, 0, sizeof(*handler));
memset(handler, 0, sizeof(*handler));
handler->fd = socket(AF_NETLINK, SOCK_RAW, protocol);
if (handler->fd < 0)
return -errno;
handler->fd = socket(AF_NETLINK, SOCK_RAW, protocol);
if (handler->fd < 0)
return -errno;
if (setsockopt(handler->fd, SOL_SOCKET, SO_SNDBUF,
if (setsockopt(handler->fd, SOL_SOCKET, SO_SNDBUF,
&sndbuf, sizeof(sndbuf)) < 0)
return -errno;
return -errno;
if (setsockopt(handler->fd, SOL_SOCKET, SO_RCVBUF,
if (setsockopt(handler->fd, SOL_SOCKET, SO_RCVBUF,
&rcvbuf,sizeof(rcvbuf)) < 0)
return -errno;
return -errno;
memset(&handler->local, 0, sizeof(handler->local));
handler->local.nl_family = AF_NETLINK;
handler->local.nl_groups = 0;
memset(&handler->local, 0, sizeof(handler->local));
handler->local.nl_family = AF_NETLINK;
handler->local.nl_groups = 0;
if (bind(handler->fd, (struct sockaddr*)&handler->local,
if (bind(handler->fd, (struct sockaddr*)&handler->local,
sizeof(handler->local)) < 0)
return -errno;
return -errno;
socklen = sizeof(handler->local);
if (getsockname(handler->fd, (struct sockaddr*)&handler->local,
socklen = sizeof(handler->local);
if (getsockname(handler->fd, (struct sockaddr*)&handler->local,
&socklen) < 0)
return -errno;
return -errno;
if (socklen != sizeof(handler->local))
return -EINVAL;
if (socklen != sizeof(handler->local))
return -EINVAL;
if (handler->local.nl_family != AF_NETLINK)
return -EINVAL;
if (handler->local.nl_family != AF_NETLINK)
return -EINVAL;
handler->seq = time(NULL);
return 0;
return 0;
}
extern int netlink_close(struct nl_handler *handler)
......
src/lxc/nl.h
......@@ -46,10 +46,10 @@
* @peer: the peer address
*/
struct nl_handler {
int fd;
int fd;
int seq;
struct sockaddr_nl local;
struct sockaddr_nl peer;
struct sockaddr_nl local;
struct sockaddr_nl peer;
};
/*
......
src/lxc/start.c
......@@ -505,10 +505,10 @@ static void lxc_abort(const char *name, struct lxc_handler *handler)
*/
static int container_reboot_supported(void *arg)
{
int *cmd = arg;
int *cmd = arg;
int ret;
ret = reboot(*cmd);
ret = reboot(*cmd);
if (ret == -1 && errno == EINVAL)
return 1;
return 0;
......@@ -518,10 +518,10 @@ static int must_drop_cap_sys_boot(struct lxc_conf *conf)
{
FILE *f;
int ret, cmd, v, flags;
long stack_size = 4096;
void *stack = alloca(stack_size);
int status;
pid_t pid;
long stack_size = 4096;
void *stack = alloca(stack_size);
int status;
pid_t pid;
f = fopen("/proc/sys/kernel/ctrl-alt-del", "r");
if (!f) {
......@@ -621,7 +621,7 @@ static int do_start(void *data)
return -1;
}
/* This prctl must be before the synchro, so if the parent
/* This prctl must be before the synchro, so if the parent
* dies before we set the parent death signal, we will detect
* its death with the synchro right after, otherwise we have
* a window where the parent can exit before we set the pdeath
......@@ -1102,7 +1102,7 @@ int __lxc_start(const char *name, struct lxc_conf *conf,
* lxc-execute which simply exited. In any case, treat
* it as a 'halt'
*/
if (WIFSIGNALED(status)) {
if (WIFSIGNALED(status)) {
switch(WTERMSIG(status)) {
case SIGINT: /* halt */
DEBUG("Container halting");
......@@ -1118,7 +1118,7 @@ int __lxc_start(const char *name, struct lxc_conf *conf,
DEBUG("unknown exit status for init: %d", WTERMSIG(status));
break;
}
}
}
DEBUG("Pushing physical nics back to host namespace");
lxc_rename_phys_nics_on_shutdown(netnsfd, handler->conf);
......
src/tests/concurrent.c
......@@ -85,8 +85,8 @@ static void do_function(void *arguments)
}
if (debug) {
c->set_config_item(c, "lxc.loglevel", "DEBUG");
c->set_config_item(c, "lxc.logfile", name);
c->set_config_item(c, "lxc.loglevel", "DEBUG");
c->set_config_item(c, "lxc.logfile", name);
}
if (strcmp(args->mode, "create") == 0) {
......@@ -132,7 +132,7 @@ static void do_function(void *arguments)
out:
lxc_container_put(c);
if (debug)
lxc_log_close();
lxc_log_close();
}
static void *concurrent(void *arguments)
......@@ -171,9 +171,9 @@ int main(int argc, char *argv[]) {
case 'q':
quiet = 1;
break;
case 'D':
debug = 1;
break;
case 'D':
debug = 1;
break;
case 'm': {
char *mode_tok, *tok, *saveptr = NULL;
......@@ -187,10 +187,10 @@ int main(int argc, char *argv[]) {
exit(EXIT_FAILURE);
}
modes[i] = tok;
}
}
modes[i] = NULL;
break;
}
}
default: /* '?' */
usage();
exit(EXIT_FAILURE);
......
src/tests/reboot.c
......@@ -35,43 +35,43 @@ int clone(int (*fn)(void *), void *child_stack, int flags, void *arg, ...);
static int do_reboot(void *arg)
{
int *cmd = arg;
int *cmd = arg;
if (reboot(*cmd))
printf("failed to reboot(%d): %m\n", *cmd);
if (reboot(*cmd))
printf("failed to reboot(%d): %m\n", *cmd);
return 0;
}
static int test_reboot(int cmd, int sig)
{
long stack_size = 4096;
void *stack = alloca(stack_size) + stack_size;
int status;
pid_t ret;
ret = clone(do_reboot, stack, CLONE_NEWPID | SIGCHLD, &cmd);
if (ret < 0) {
printf("failed to clone: %m\n");
return -1;
}
if (wait(&status) < 0) {
printf("unexpected wait error: %m\n");
return -1;
}
if (!WIFSIGNALED(status)) {
long stack_size = 4096;
void *stack = alloca(stack_size) + stack_size;
int status;
pid_t ret;
ret = clone(do_reboot, stack, CLONE_NEWPID | SIGCHLD, &cmd);
if (ret < 0) {
printf("failed to clone: %m\n");
return -1;
}
if (wait(&status) < 0) {
printf("unexpected wait error: %m\n");
return -1;
}
if (!WIFSIGNALED(status)) {
if (sig != -1)
printf("child process exited but was not signaled\n");
return -1;
}
return -1;
}
if (WTERMSIG(status) != sig) {
printf("signal termination is not the one expected\n");
return -1;
}
if (WTERMSIG(status) != sig) {
printf("signal termination is not the one expected\n");
return -1;
}
return 0;
return 0;
}
static int have_reboot_patch(void)
......@@ -95,46 +95,46 @@ static int have_reboot_patch(void)
int main(int argc, char *argv[])
{
int status;
int status;
if (getuid() != 0) {
printf("Must run as root.\n");
return 1;
printf("Must run as root.\n");
return 1;
}
status = have_reboot_patch();
if (status != 0) {
printf("Your kernel does not have the container reboot patch\n");
return 1;
printf("Your kernel does not have the container reboot patch\n");
return 1;
}
status = test_reboot(LINUX_REBOOT_CMD_CAD_ON, -1);
if (status >= 0) {
printf("reboot(LINUX_REBOOT_CMD_CAD_ON) should have failed\n");
return 1;
}
printf("reboot(LINUX_REBOOT_CMD_CAD_ON) has failed as expected\n");
status = test_reboot(LINUX_REBOOT_CMD_RESTART, SIGHUP);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_RESTART) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_RESTART2, SIGHUP);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_RESTART2) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_HALT, SIGINT);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_HALT) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_POWER_OFF, SIGINT);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_POWERR_OFF) succeed\n");
printf("All tests passed\n");
return 0;
status = test_reboot(LINUX_REBOOT_CMD_CAD_ON, -1);
if (status >= 0) {
printf("reboot(LINUX_REBOOT_CMD_CAD_ON) should have failed\n");
return 1;
}
printf("reboot(LINUX_REBOOT_CMD_CAD_ON) has failed as expected\n");
status = test_reboot(LINUX_REBOOT_CMD_RESTART, SIGHUP);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_RESTART) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_RESTART2, SIGHUP);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_RESTART2) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_HALT, SIGINT);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_HALT) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_POWER_OFF, SIGINT);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_POWERR_OFF) succeed\n");
printf("All tests passed\n");
return 0;
}
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