From 51a8a74c070e4a4cdc2dce07d92f37b531a610e3 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 8 Feb 2019 23:57:06 +0100
Subject: [PATCH] coccinelle: s/while({1,true})/for(;;)/

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 coccinelle/while-true.cocci | 12 ++++++++++++
 src/lxc/cmd/lxc_init.c      |  2 +-
 src/lxc/lxccontainer.c      |  4 ++--
 src/lxc/network.c           |  2 +-
 src/lxc/pam/pam_cgfs.c      |  4 ++--
 src/lxc/storage/btrfs.c     |  2 +-
 src/lxc/storage/nbd.c       |  2 +-
 src/lxc/string_utils.c      |  4 ++--
 src/lxc/tools/arguments.c   |  2 +-
 src/lxc/utils.c             |  2 +-
 10 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 coccinelle/while-true.cocci

diff --git a/coccinelle/while-true.cocci b/coccinelle/while-true.cocci
new file mode 100644
index 000000000..c23fb11f2
--- /dev/null
+++ b/coccinelle/while-true.cocci
@@ -0,0 +1,12 @@
+@@
+statement s;
+@@
+- while (true)
++ for (;;)
+s
+@@
+statement s;
+@@
+- while (1)
++ for (;;)
+s
diff --git a/src/lxc/cmd/lxc_init.c b/src/lxc/cmd/lxc_init.c
index b3849545a..7b94f37b6 100644
--- a/src/lxc/cmd/lxc_init.c
+++ b/src/lxc/cmd/lxc_init.c
@@ -492,7 +492,7 @@ See the lxc-init man page for further information.\n\n");
 static int arguments_parse(struct arguments *args, int argc,
 			   char *const argv[])
 {
-	while (true) {
+	for (;;) {
 		int c;
 		int index = 0;
 
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 3a6696039..9875a58a3 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -3365,7 +3365,7 @@ static int copy_file(const char *old, const char *new)
 		return -1;
 	}
 
-	while (1) {
+	for (;;) {
 		len = lxc_read_nointr(in, buf, 8096);
 		if (len < 0) {
 			SYSERROR("Error reading old file %s", old);
@@ -4100,7 +4100,7 @@ static int get_next_index(const char *lxcpath, char *cname)
 
 	fname = must_realloc(NULL, strlen(lxcpath) + 20);
 
-	while (1) {
+	for (;;) {
 		sprintf(fname, "%s/snap%d", lxcpath, i);
 
 		ret = stat(fname, &sb);
diff --git a/src/lxc/network.c b/src/lxc/network.c
index 249d9d471..e05c56615 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -1974,7 +1974,7 @@ char *lxc_mkifname(char *template)
 	}
 
 	/* Generate random names until we find one that doesn't exist. */
-	while (true) {
+	for (;;) {
 		name[0] = '\0';
 		(void)strlcpy(name, template, IFNAMSIZ);
 
diff --git a/src/lxc/pam/pam_cgfs.c b/src/lxc/pam/pam_cgfs.c
index 1a377d7aa..2fb3f7378 100644
--- a/src/lxc/pam/pam_cgfs.c
+++ b/src/lxc/pam/pam_cgfs.c
@@ -259,7 +259,7 @@ static bool mkdir_parent(const char *root, char *path)
 		return true;
 
 	b = path + strlen(root) + 1;
-	while (true) {
+	for (;;) {
 		while (*b && (*b == '/'))
 			b++;
 		if (!*b)
@@ -878,7 +878,7 @@ static char *cgv1_get_current_cgroup(char *basecginfo, char *controller)
 
 	p = basecginfo;
 
-	while (true) {
+	for (;;) {
 		p = strchr(p, ':');
 		if (!p)
 			return NULL;
diff --git a/src/lxc/storage/btrfs.c b/src/lxc/storage/btrfs.c
index bbfce61b9..06ec7e8c7 100644
--- a/src/lxc/storage/btrfs.c
+++ b/src/lxc/storage/btrfs.c
@@ -805,7 +805,7 @@ static int btrfs_recursive_destroy(const char *path)
 	sk->max_transid = (u64)-1;
 	sk->nr_items = 4096;
 
-	while(1) {
+	for (;;) {
 		ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
 		e = errno;
 		if (ret < 0) {
diff --git a/src/lxc/storage/nbd.c b/src/lxc/storage/nbd.c
index 8b19d63ac..09990467a 100644
--- a/src/lxc/storage/nbd.c
+++ b/src/lxc/storage/nbd.c
@@ -72,7 +72,7 @@ bool attach_nbd(char *src, struct lxc_conf *conf)
 	if (p)
 		*p = '\0';
 
-	while (1) {
+	for (;;) {
 		sprintf(path, "/dev/nbd%d", i);
 
 		if (!file_exists(path))
diff --git a/src/lxc/string_utils.c b/src/lxc/string_utils.c
index 184921c11..eb83f5505 100644
--- a/src/lxc/string_utils.c
+++ b/src/lxc/string_utils.c
@@ -69,7 +69,7 @@ char **lxc_va_arg_list_to_argv(va_list ap, size_t skip, int do_strdup)
 	 * constantly...
 	 */
 	va_copy(ap2, ap);
-	while (1) {
+	for (;;) {
 		char *arg = va_arg(ap2, char *);
 		if (!arg)
 			break;
@@ -82,7 +82,7 @@ char **lxc_va_arg_list_to_argv(va_list ap, size_t skip, int do_strdup)
 		return NULL;
 
 	count = skip;
-	while (1) {
+	for (;;) {
 		char *arg = va_arg(ap, char *);
 		if (!arg)
 			break;
diff --git a/src/lxc/tools/arguments.c b/src/lxc/tools/arguments.c
index 99b346207..f335f6225 100644
--- a/src/lxc/tools/arguments.c
+++ b/src/lxc/tools/arguments.c
@@ -207,7 +207,7 @@ extern int lxc_arguments_parse(struct lxc_arguments *args, int argc,
 		return ret;
 	}
 
-	while (true) {
+	for (;;) {
 		int c;
 		int index = 0;
 
diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 560e333ef..be81727c3 100644
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -1101,7 +1101,7 @@ static int open_without_symlink(const char *target, const char *prefix_skip)
 		goto out;
 	}
 
-	while (1) {
+	for (;;) {
 		int newfd, saved_errno;
 		char *nextpath;
 
-- 
2.47.2