From: Michel Normand <normand@fr.ibm.com>
Date: Thu, 21 Jan 2010 13:34:08 +0000 (+0100)
Subject: typo in restart and checkpoint
X-Git-Tag: lxc-0.6.5~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=267d974e594428bccc1f055c5838ac387777be9f;p=thirdparty%2Flxc.git

typo in restart and checkpoint

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

diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
index 8cf21c173..b0b9f4e61 100644
--- a/src/lxc/lxc.h
+++ b/src/lxc/lxc.h
@@ -154,11 +154,11 @@ extern int lxc_checkpoint(const char *name, const char *statefile, int flags);
  * Restart a container
  * @name : the name of the container being restarted
  * @statefile: string object from which the container is restarted
- * @rcfile: container configuration file.
+ * @conf: lxc_conf structure.
  * @flags : restart flags (an ORed value)
  * Returns 0 on success, < 0 otherwise
  */
-extern int lxc_restart(const char *, const char *, const char *, int);
+extern int lxc_restart(const char *, const char *, struct lxc_conf *, int);
 
 /*
  * Returns the version number of the library
diff --git a/src/lxc/lxc_checkpoint.c b/src/lxc/lxc_checkpoint.c
index 4fee11936..a8c74a9a3 100644
--- a/src/lxc/lxc_checkpoint.c
+++ b/src/lxc/lxc_checkpoint.c
@@ -1,7 +1,7 @@
 /*
  * lxc: linux Container library
  *
- * (C) Copyright IBM Corp. 2007, 2008
+ * (C) Copyright IBM Corp. 2007, 2010
  *
  * Authors:
  * Daniel Lezcano <dlezcano at fr.ibm.com>
@@ -112,12 +112,10 @@ int main(int argc, char *argv[])
 		return ret;
 
 	ret = lxc_checkpoint(my_args.name, my_args.statefile, my_args.flags);
-	if (ret) {
+	if (ret)
 		ERROR("failed to checkpoint '%s'", my_args.name);
-		return ret;
-	}
-
-	INFO("'%s' checkpointed", my_args.name);
+	else
+		INFO("'%s' checkpointed", my_args.name);
 
 	return ret;
 }
diff --git a/src/lxc/restart.c b/src/lxc/restart.c
index 42576c148..467489ebc 100644
--- a/src/lxc/restart.c
+++ b/src/lxc/restart.c
@@ -1,7 +1,7 @@
 /*
  * lxc: linux Container library
  *
- * (C) Copyright IBM Corp. 2007, 2008
+ * (C) Copyright IBM Corp. 2007, 2010
  *
  * Authors:
  * Daniel Lezcano <dlezcano at fr.ibm.com>
@@ -25,7 +25,7 @@
 
 lxc_log_define(lxc_restart, lxc);
 
-int lxc_restart(const char *name, const char *statefile, const char *rcfile,
+int lxc_restart(const char *name, const char *statefile, struct lxc_conf *conf,
 		int flags)
 {
 	return 0;