From 55c76589fd19e5f04697dcfd0084039cd77ef304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 19 Aug 2013 14:37:20 +0200 Subject: [PATCH] Remove all trailing whitespaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- doc/lxc.conf.sgml.in | 2 +- src/include/ifaddrs.c | 78 +++++++++++++++++----------------- src/lxc/cgroup.c | 2 +- src/python-lxc/lxc.c | 6 +-- src/python-lxc/lxc/__init__.py | 4 +- templates/lxc-cirros.in | 4 +- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in index 02667fcf1..99086aa59 100644 --- a/doc/lxc.conf.sgml.in +++ b/doc/lxc.conf.sgml.in @@ -871,7 +871,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA The hook type (i.e. 'clone' or 'pre-mount'). Additional arguments In the case of the clone hook, any extra arguments passed to - lxc-clone will appear as further arguments to the hook. + lxc-clone will appear as further arguments to the hook. The following environment variables are set: diff --git a/src/include/ifaddrs.c b/src/include/ifaddrs.c index 855f0cd03..109f32297 100644 --- a/src/include/ifaddrs.c +++ b/src/include/ifaddrs.c @@ -48,7 +48,7 @@ static int netlink_socket(void) { return -1; } - + struct sockaddr_nl l_addr; memset(&l_addr, 0, sizeof(l_addr)); l_addr.nl_family = AF_NETLINK; @@ -57,7 +57,7 @@ static int netlink_socket(void) close(l_socket); return -1; } - + return l_socket; } @@ -67,14 +67,14 @@ static int netlink_send(int p_socket, int p_request) memset(l_buffer, 0, sizeof(l_buffer)); struct nlmsghdr *l_hdr = (struct nlmsghdr *)l_buffer; struct rtgenmsg *l_msg = (struct rtgenmsg *)NLMSG_DATA(l_hdr); - + l_hdr->nlmsg_len = NLMSG_LENGTH(sizeof(*l_msg)); l_hdr->nlmsg_type = p_request; l_hdr->nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST; l_hdr->nlmsg_pid = 0; l_hdr->nlmsg_seq = p_socket; l_msg->rtgen_family = AF_UNSPEC; - + struct sockaddr_nl l_addr; memset(&l_addr, 0, sizeof(l_addr)); l_addr.nl_family = AF_NETLINK; @@ -97,7 +97,7 @@ static int netlink_recv(int p_socket, void *p_buffer, size_t p_len) l_msg.msg_controllen = 0; l_msg.msg_flags = 0; int l_result = recvmsg(p_socket, &l_msg, 0); - + if(l_result < 0) { if(errno == EINTR) @@ -106,7 +106,7 @@ static int netlink_recv(int p_socket, void *p_buffer, size_t p_len) } return -2; } - + if(l_msg.msg_flags & MSG_TRUNC) { // buffer was too small return -1; @@ -119,12 +119,12 @@ static struct nlmsghdr *getNetlinkResponse(int p_socket, int *p_size, int *p_don { size_t l_size = 4096; void *l_buffer = NULL; - + for(;;) { free(l_buffer); l_buffer = malloc(l_size); - + int l_read = netlink_recv(p_socket, l_buffer, l_size); *p_size = l_read; if(l_read == -2) @@ -142,13 +142,13 @@ static struct nlmsghdr *getNetlinkResponse(int p_socket, int *p_size, int *p_don { continue; } - + if(l_hdr->nlmsg_type == NLMSG_DONE) { *p_done = 1; break; } - + if(l_hdr->nlmsg_type == NLMSG_ERROR) { free(l_buffer); @@ -157,7 +157,7 @@ static struct nlmsghdr *getNetlinkResponse(int p_socket, int *p_size, int *p_don } return l_buffer; } - + l_size *= 2; } } @@ -202,7 +202,7 @@ static NetlinkList *getResultList(int p_socket, int p_request) freeResultList(l_list); return NULL; } - + NetlinkList *l_item = newListItem(l_hdr, l_size); if(!l_list) { @@ -282,7 +282,7 @@ static void interpretLink(struct nlmsghdr *p_hdr, struct ifaddrs **p_links, stru size_t l_nameSize = 0; size_t l_addrSize = 0; size_t l_dataSize = 0; - + size_t l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifinfomsg)); struct rtattr *l_rta; for(l_rta = (struct rtattr *)(((char *)l_info) + NLMSG_ALIGN(sizeof(struct ifinfomsg))); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize)) @@ -304,17 +304,17 @@ static void interpretLink(struct nlmsghdr *p_hdr, struct ifaddrs **p_links, stru break; } } - + struct ifaddrs *l_entry = malloc(sizeof(struct ifaddrs) + l_nameSize + l_addrSize + l_dataSize); memset(l_entry, 0, sizeof(struct ifaddrs)); l_entry->ifa_name = ""; - + char *l_name = ((char *)l_entry) + sizeof(struct ifaddrs); char *l_addr = l_name + l_nameSize; char *l_data = l_addr + l_addrSize; - + l_entry->ifa_flags = l_info->ifi_flags; - + l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifinfomsg)); for(l_rta = (struct rtattr *)(((char *)l_info) + NLMSG_ALIGN(sizeof(struct ifinfomsg))); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize)) { @@ -353,7 +353,7 @@ static void interpretLink(struct nlmsghdr *p_hdr, struct ifaddrs **p_links, stru break; } } - + addToEnd(p_resultList, l_entry); p_links[l_info->ifi_index - 1] = l_entry; } @@ -364,9 +364,9 @@ static void interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_links, stru size_t l_nameSize = 0; size_t l_addrSize = 0; - + int l_addedNetmask = 0; - + size_t l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifaddrmsg)); struct rtattr *l_rta; for(l_rta = (struct rtattr *)(((char *)l_info) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize)) @@ -376,7 +376,7 @@ static void interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_links, stru { continue; } - + switch(l_rta->rta_type) { case IFA_ADDRESS: @@ -396,16 +396,16 @@ static void interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_links, stru break; } } - + struct ifaddrs *l_entry = malloc(sizeof(struct ifaddrs) + l_nameSize + l_addrSize); memset(l_entry, 0, sizeof(struct ifaddrs)); l_entry->ifa_name = p_links[l_info->ifa_index - 1]->ifa_name; - + char *l_name = ((char *)l_entry) + sizeof(struct ifaddrs); char *l_addr = l_name + l_nameSize; - + l_entry->ifa_flags = l_info->ifa_flags | p_links[l_info->ifa_index - 1]->ifa_flags; - + l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifaddrmsg)); for(l_rta = (struct rtattr *)(((char *)l_info) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize)) { @@ -426,7 +426,7 @@ static void interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_links, stru ((struct sockaddr_in6 *)l_addr)->sin6_scope_id = l_info->ifa_index; } } - + if(l_rta->rta_type == IFA_ADDRESS) { // apparently in a point-to-point network IFA_ADDRESS contains the dest address and IFA_LOCAL contains the local address if(l_entry->ifa_addr) @@ -462,7 +462,7 @@ static void interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_links, stru break; } } - + if(l_entry->ifa_addr && (l_entry->ifa_addr->sa_family == AF_INET || l_entry->ifa_addr->sa_family == AF_INET6)) { unsigned l_maxPrefix = (l_entry->ifa_addr->sa_family == AF_INET ? 32 : 128); @@ -474,11 +474,11 @@ static void interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_links, stru l_mask[i] = 0xff; } l_mask[i] = 0xff << (8 - (l_prefix % 8)); - + makeSockaddr(l_entry->ifa_addr->sa_family, (struct sockaddr *)l_addr, l_mask, l_maxPrefix / 8); l_entry->ifa_netmask = (struct sockaddr *)l_addr; } - + addToEnd(p_resultList, l_entry); } @@ -495,12 +495,12 @@ static void interpret(int p_socket, NetlinkList *p_netlinkList, struct ifaddrs * { continue; } - + if(l_hdr->nlmsg_type == NLMSG_DONE) { break; } - + if(l_hdr->nlmsg_type == RTM_NEWLINK) { interpretLink(l_hdr, p_links, p_resultList); @@ -527,19 +527,19 @@ static unsigned countLinks(int p_socket, NetlinkList *p_netlinkList) { continue; } - + if(l_hdr->nlmsg_type == NLMSG_DONE) { break; } - + if(l_hdr->nlmsg_type == RTM_NEWLINK) { ++l_links; } } } - + return l_links; } @@ -550,20 +550,20 @@ int getifaddrs(struct ifaddrs **ifap) return -1; } *ifap = NULL; - + int l_socket = netlink_socket(); if(l_socket < 0) { return -1; } - + NetlinkList *l_linkResults = getResultList(l_socket, RTM_GETLINK); if(!l_linkResults) { close(l_socket); return -1; } - + NetlinkList *l_addrResults = getResultList(l_socket, RTM_GETADDR); if(!l_addrResults) { @@ -571,11 +571,11 @@ int getifaddrs(struct ifaddrs **ifap) freeResultList(l_linkResults); return -1; } - + unsigned l_numLinks = countLinks(l_socket, l_linkResults) + countLinks(l_socket, l_addrResults); struct ifaddrs *l_links[l_numLinks]; memset(l_links, 0, l_numLinks * sizeof(struct ifaddrs *)); - + interpret(l_socket, l_linkResults, l_links, ifap); interpret(l_socket, l_addrResults, l_links, ifap); diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c index 94bf16099..0d2b81ca6 100644 --- a/src/lxc/cgroup.c +++ b/src/lxc/cgroup.c @@ -630,7 +630,7 @@ static char *record_visited(char *opts, char *all_subsystems) return visited; } - + static char *get_all_subsystems(void) { FILE *f; diff --git a/src/python-lxc/lxc.c b/src/python-lxc/lxc.c index ddf3fa098..7b103ffe3 100644 --- a/src/python-lxc/lxc.c +++ b/src/python-lxc/lxc.c @@ -37,7 +37,7 @@ char** convert_tuple_to_char_pointer_array(PyObject *argv) { int argc; int i, j; - + /* not a list or tuple */ if (!PyList_Check(argv) && !PyTuple_Check(argv)) { PyErr_SetString(PyExc_TypeError, "Expected list or tuple."); @@ -707,7 +707,7 @@ static int lxc_attach_python_exec(void* _payload) { struct lxc_attach_python_payload *payload = (struct lxc_attach_python_payload *)_payload; PyObject *result = PyObject_CallFunctionObjArgs(payload->fn, payload->arg, NULL); - + if (!result) { PyErr_Print(); return -1; @@ -741,7 +741,7 @@ static lxc_attach_options_t *lxc_attach_parse_options(PyObject *kwds) } memcpy(options, &default_options, sizeof(*options)); - /* we need some dummy variables because we can't be sure + /* we need some dummy variables because we can't be sure * the data types match completely */ temp_uid = -1; temp_gid = -1; diff --git a/src/python-lxc/lxc/__init__.py b/src/python-lxc/lxc/__init__.py index 1748bacc1..50b40550c 100644 --- a/src/python-lxc/lxc/__init__.py +++ b/src/python-lxc/lxc/__init__.py @@ -428,7 +428,7 @@ def list_containers(as_object=False, config_path=None): def attach_run_command(cmd): """ Run a command when attaching - + Please do not call directly, this will execvp the command. This is to be used in conjunction with the attach method of a container. @@ -443,7 +443,7 @@ def attach_run_command(cmd): def attach_run_shell(): """ Run a shell when attaching - + Please do not call directly, this will execvp the shell. This is to be used in conjunction with the attach method of a container. diff --git a/templates/lxc-cirros.in b/templates/lxc-cirros.in index 4196ba41d..5934f4d10 100644 --- a/templates/lxc-cirros.in +++ b/templates/lxc-cirros.in @@ -290,12 +290,12 @@ create_main() { if [ -b "$rootfs_d/dev/random" ]; then rm -f "$rootfs_d/dev/random" && mknod --mode=666 "$rootfs_d/dev/random" c 1 8 || - { error "failed to fix /dev/random"; return 1; } + { error "failed to fix /dev/random"; return 1; } fi if [ -b "$rootfs_d/dev/urandom" ]; then rm -f "$rootfs_d/dev/urandom" && mknod --mode=666 "$rootfs_d/dev/urandom" c 1 9 || - { error "failed to fix /dev/urandom"; return 1; } + { error "failed to fix /dev/urandom"; return 1; } fi if [ "$version" = "0.3.2~pre1" ]; then