[CRIU] [PATCH 2/7] files.c cleanup: break long lines

Kir Kolyshkin kir at openvz.org
Fri Feb 10 18:30:05 EST 2012


No code change, pure cleanup

Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 files.c |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/files.c b/files.c
index 207a6a0..9e5decc 100644
--- a/files.c
+++ b/files.c
@@ -87,13 +87,15 @@ static int get_file_path(char *path, struct fdinfo_entry *fe, int fd)
 
 int prepare_fdinfo_global()
 {
-	fdinfo_descs = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, 0, 0);
+	fdinfo_descs = mmap(NULL, 4096, PROT_READ | PROT_WRITE,
+			MAP_SHARED | MAP_ANON, 0, 0);
 	if (fdinfo_descs == MAP_FAILED) {
 		pr_perror("Can't map fdinfo_descs");
 		return -1;
 	}
 
-	fdinfo_list = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, 0, 0);
+	fdinfo_list = mmap(NULL, 4096, PROT_READ | PROT_WRITE,
+			MAP_SHARED | MAP_ANON, 0, 0);
 	if (fdinfo_list == MAP_FAILED) {
 		pr_perror("Can't map fdinfo_list");
 		return -1;
@@ -238,7 +240,8 @@ static int restore_exe_early(struct fdinfo_entry *fe, int fd)
 	return 0;
 }
 
-struct fdinfo_list_entry *find_fdinfo_list_entry(int pid, int fd, struct fdinfo_desc *fi)
+struct fdinfo_list_entry *find_fdinfo_list_entry(int pid, int fd,
+		struct fdinfo_desc *fi)
 {
 	struct fdinfo_list_entry *fle;
 	int found = 0;
@@ -272,8 +275,10 @@ static int open_transport_fd(int pid, struct fdinfo_entry *fe,
 	sun_len = SUN_LEN(&saddr);
 	*saddr.sun_path = '\0';
 
-	pr_info("\t%d: Create transport fd for %lx type %d namelen %d users %d\n", pid,
-			(unsigned long)fe->addr, fe->type, fe->len, fi->users);
+	pr_info("\t%d: Create transport fd for %lx type %d namelen %d "
+			"users %d\n",
+			pid, (unsigned long)fe->addr, fe->type, fe->len,
+			fi->users);
 
 	fle = find_fdinfo_list_entry(pid, fe->addr, fi);
 
@@ -341,7 +346,8 @@ static int open_fd(int pid, struct fdinfo_entry *fe,
 		pr_info("Wait fdinfo pid=%d fd=%d\n", fle->pid, fle->fd);
 		cr_wait_while(&fle->real_pid, 0);
 
-		pr_info("Send fd %d to %s\n", (int)fe->addr, saddr.sun_path + 1);
+		pr_info("Send fd %d to %s\n",
+				(int)fe->addr, saddr.sun_path + 1);
 
 		saddr.sun_family = AF_UNIX;
 		snprintf(saddr.sun_path, UNIX_PATH_MAX,
@@ -400,7 +406,8 @@ static int open_fmap(int pid, struct fdinfo_entry *fe, int fd)
 	if (tmp < 0)
 		return -1;
 
-	pr_info("%d:\t\tWill map %lx to %d\n", pid, (unsigned long)fe->addr, tmp);
+	pr_info("%d:\t\tWill map %lx to %d\n",
+			pid, (unsigned long)fe->addr, tmp);
 
 	new = xmalloc(sizeof(*new));
 	if (!new) {
@@ -418,7 +425,8 @@ static int open_fmap(int pid, struct fdinfo_entry *fe, int fd)
 	return 0;
 }
 
-static int open_fdinfo(int pid, struct fdinfo_entry *fe, int *fdinfo_fd, int state)
+static int open_fdinfo(int pid, struct fdinfo_entry *fe, int *fdinfo_fd,
+		int state)
 {
 	u32 mag;
 	int ret = 0;
@@ -502,7 +510,8 @@ int prepare_fds(int pid)
 			}
 
 			if (fd_is_special(&fe)) {
-				if (open_special_fdinfo(pid, &fe, fdinfo_fd, state))
+				if (open_special_fdinfo(pid, &fe, fdinfo_fd,
+							state))
 					goto err;
 
 				continue;
-- 
1.7.7.6



More information about the CRIU mailing list