[CRIU] [PATCH 6/6] opts: fix formatting for options

Tycho Andersen tycho.andersen at canonical.com
Tue Apr 7 16:37:21 PDT 2015


Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
---
 crtools.c | 94 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/crtools.c b/crtools.c
index 095c86e..9d95145 100644
--- a/crtools.c
+++ b/crtools.c
@@ -159,53 +159,53 @@ int main(int argc, char *argv[], char *envp[])
 	char *work_dir = NULL;
 	static const char short_opts[] = "dSsRf:F:t:p:hcD:o:n:v::xVr:jlW:L:M:";
 	static struct option long_opts[] = {
-		{ "tree",		required_argument,	0, 't'	},
-		{ "pid",		required_argument,	0, 'p'	},
-		{ "leave-stopped",	no_argument,		0, 's'	},
-		{ "leave-running",	no_argument,		0, 'R'	},
-		{ "restore-detached",	no_argument,		0, 'd'	},
-		{ "restore-sibling",	no_argument,		0, 'S'	},
-		{ "daemon",		no_argument,		0, 'd'	},
-		{ "contents",		no_argument,		0, 'c'	},
-		{ "file",		required_argument,	0, 'f'	},
-		{ "fields",		required_argument,	0, 'F'	},
-		{ "images-dir",		required_argument,	0, 'D'	},
-		{ "work-dir",		required_argument,	0, 'W'	},
-		{ "log-file",		required_argument,	0, 'o'	},
-		{ "namespaces",		required_argument,	0, 'n'	},
-		{ "root",		required_argument,	0, 'r'	},
-		{ USK_EXT_PARAM,	no_argument,		0, 'x'	},
-		{ "help",		no_argument,		0, 'h'	},
-		{ SK_EST_PARAM,		no_argument,		0, 1042	},
-		{ "close",		required_argument,	0, 1043	},
-		{ "log-pid",		no_argument,		0, 1044	},
-		{ "version",		no_argument,		0, 'V'	},
-		{ "evasive-devices",	no_argument,		0, 1045	},
-		{ "pidfile",		required_argument,	0, 1046	},
-		{ "veth-pair",		required_argument,	0, 1047	},
-		{ "action-script",	required_argument,	0, 1049	},
-		{ LREMAP_PARAM,		no_argument,		0, 1041	},
-		{ OPT_SHELL_JOB,	no_argument,		0, 'j'	},
-		{ OPT_FILE_LOCKS,	no_argument,		0, 'l'	},
-		{ "page-server",	no_argument,		0, 1050	},
-		{ "address",		required_argument,	0, 1051	},
-		{ "port",		required_argument,	0, 1052	},
-		{ "prev-images-dir",	required_argument,	0, 1053	},
-		{ "ms",			no_argument,		0, 1054	},
-		{ "track-mem",		no_argument,		0, 1055	},
-		{ "auto-dedup",		no_argument,		0, 1056	},
-		{ "libdir",		required_argument,	0, 'L'	},
-		{ "cpu-cap",		optional_argument,	0, 1057	},
-		{ "force-irmap",	no_argument,		0, 1058	},
-		{ "ext-mount-map",	required_argument,	0, 'M'	},
-		{ "exec-cmd",		no_argument,		0, 1059	},
-		{ "manage-cgroups",	no_argument,		0, 1060	},
-		{ "cgroup-root",	required_argument,	0, 1061	},
-		{ "inherit-fd",		required_argument,	0, 1062	},
-		{ "feature",		required_argument,	0, 1063	},
-		{ "skip-mnt",		required_argument,	0, 1064},
-		{ "enable-external-sharing", no_argument, 	0, 1065 },
-		{ "enable-external-masters", no_argument, 	0, 1066 },
+		{ "tree",			required_argument,	0, 't'	},
+		{ "pid",			required_argument,	0, 'p'	},
+		{ "leave-stopped",		no_argument,		0, 's'	},
+		{ "leave-running",		no_argument,		0, 'R'	},
+		{ "restore-detached",		no_argument,		0, 'd'	},
+		{ "restore-sibling",		no_argument,		0, 'S'	},
+		{ "daemon",			no_argument,		0, 'd'	},
+		{ "contents",			no_argument,		0, 'c'	},
+		{ "file",			required_argument,	0, 'f'	},
+		{ "fields",			required_argument,	0, 'F'	},
+		{ "images-dir",			required_argument,	0, 'D'	},
+		{ "work-dir",			required_argument,	0, 'W'	},
+		{ "log-file",			required_argument,	0, 'o'	},
+		{ "namespaces",			required_argument,	0, 'n'	},
+		{ "root",			required_argument,	0, 'r'	},
+		{ USK_EXT_PARAM,		no_argument,		0, 'x'	},
+		{ "help",			no_argument,		0, 'h'	},
+		{ SK_EST_PARAM,			no_argument,		0, 1042	},
+		{ "close",			required_argument,	0, 1043	},
+		{ "log-pid",			no_argument,		0, 1044	},
+		{ "version",			no_argument,		0, 'V'	},
+		{ "evasive-devices",		no_argument,		0, 1045	},
+		{ "pidfile",			required_argument,	0, 1046	},
+		{ "veth-pair",			required_argument,	0, 1047	},
+		{ "action-script",		required_argument,	0, 1049	},
+		{ LREMAP_PARAM,			no_argument,		0, 1041	},
+		{ OPT_SHELL_JOB,		no_argument,		0, 'j'	},
+		{ OPT_FILE_LOCKS,		no_argument,		0, 'l'	},
+		{ "page-server",		no_argument,		0, 1050	},
+		{ "address",			required_argument,	0, 1051	},
+		{ "port",			required_argument,	0, 1052	},
+		{ "prev-images-dir",		required_argument,	0, 1053	},
+		{ "ms",				no_argument,		0, 1054	},
+		{ "track-mem",			no_argument,		0, 1055	},
+		{ "auto-dedup",			no_argument,		0, 1056	},
+		{ "libdir",			required_argument,	0, 'L'	},
+		{ "cpu-cap",			optional_argument,	0, 1057	},
+		{ "force-irmap",		no_argument,		0, 1058	},
+		{ "ext-mount-map",		required_argument,	0, 'M'	},
+		{ "exec-cmd",			no_argument,		0, 1059	},
+		{ "manage-cgroups",		no_argument,		0, 1060	},
+		{ "cgroup-root",		required_argument,	0, 1061	},
+		{ "inherit-fd",			required_argument,	0, 1062	},
+		{ "feature",			required_argument,	0, 1063	},
+		{ "skip-mnt",			required_argument,	0, 1064},
+		{ "enable-external-sharing", 	no_argument, 		0, 1065 },
+		{ "enable-external-masters", 	no_argument, 		0, 1066 },
 		{ },
 	};
 
-- 
2.1.4



More information about the CRIU mailing list