From: Daniel Lezcano <daniel.lezcano@free.fr>
Date: Thu, 13 Jan 2011 15:15:15 +0000 (+0100)
Subject: mindless changes to conform indentation
X-Git-Tag: lxc-0.7.4-rc1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d330fe7b86a602798a9286d43d66a1cf7e363754;p=thirdparty%2Flxc.git

mindless changes to conform indentation

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 49361c426..b07375f72 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -923,39 +923,43 @@ static int mount_file_entries(const struct lxc_rootfs *rootfs, FILE *file)
 
 		mntflags = 0;
 		mntdata = NULL;
+
 		if (parse_mntopts(mntent, &mntflags, &mntdata) < 0) {
 			ERROR("failed to parse mount option '%s'",
-				      mntent->mnt_opts);
+			      mntent->mnt_opts);
 			goto out;
 		}
 
 		/* now figure out where to mount it to. */
 		mntdir =  mntent->mnt_dir;
 		mntroot = NULL;
+
 		if (!rootfs->path) {
-			/* if we use system root fs,
-			 * the mount is relative to / and can be absolute */
+			/* if we use system root fs, the mount is relative to '/'
+			 * and can be absolute */
 			if (mntdir[0] != '/')
-				mntroot = ""; /* this is "/" */
-		}
-		else {
+				mntroot = ""; /* this is '/' */
+		} else {
 			/* else we have a separate root, mounts are
 			 * relative to it, and absolute paths are risky */
 			if (mntdir[0] != '/')
-				/* relative too root mount point */
+				/* relative to root mount point */
 				mntroot = rootfs->mount;
-			else if (strncmp(mntdir, rootfs->mount, strlen(rootfs->mount)))
-				WARN("mount target directory '%s' is outside container root",
-					mntdir);
+			else if (strncmp(mntdir, rootfs->mount,
+					 strlen(rootfs->mount)))
+				WARN("mount target directory '%s' is outside "
+				     "container root", mntdir);
 			else
-				WARN("mount target directory '%s' is not relative to container root",
-					mntdir);
+				WARN("mount target directory '%s' is not "
+				     "relative to container root", mntdir);
 		}
+
 		if (mntroot) {
 			/* make it relative to mntroot */
 			snprintf(path, sizeof(path), "%s/%s", mntroot, mntdir);
 			mntdir = path;
 		}
+
 		if (mount(mntent->mnt_fsname, mntdir,
 			  mntent->mnt_type, mntflags & ~MS_REMOUNT, mntdata)) {
 			SYSERROR("failed to mount '%s' on '%s'",