From: Michel Normand <normand@fr.ibm.com>
Date: Sun, 17 May 2009 11:43:51 +0000 (+0200)
Subject: report error in lxc_get_lock
X-Git-Tag: lxc_0_6_3~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c200d12e0ef2236cd1f99831a04713faa951a75;p=thirdparty%2Flxc.git

report error in lxc_get_lock

report error in lxc_get_lock and remove the call to lxc_strerror
that become useless for these errors.

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

diff --git a/src/lxc/lock.c b/src/lxc/lock.c
index 656850ba2..76eaccf74 100644
--- a/src/lxc/lock.c
+++ b/src/lxc/lock.c
@@ -70,23 +70,24 @@ int lxc_get_lock(const char *name)
 	ret = __lxc_get_lock(name);
 	if (ret < 0)
 		goto out_err;
-out:
+
 	return ret;
 out_err:
 	switch (-ret) {
 	case EWOULDBLOCK:
-		ret = -LXC_ERROR_EBUSY;
-		goto out;
+		ERROR("container '%s' is busy", name);
+		break;
 	case ENOENT:
-		ret = -LXC_ERROR_ENOENT;
-		goto out;
+		ERROR("container '%s' is not found", name);
+		break;
 	case EACCES:
-		ret = -LXC_ERROR_EACCES;
-		goto out;
+		ERROR("not enough privilege to use container '%s'", name);
+		break;
 	default:
-		ret = -LXC_ERROR_LOCK;
-		goto out;
+		ERROR("container '%s' failed to lock : %s",
+		      name, strerror(-ret));
 	}
+	return -1;
 }
 
 int lxc_check_lock(const char *name)
diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index 27aee6b47..0c0f3a9b2 100644
--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
 	/* lxc-init --mount-procfs -- .... */
 	args = malloc((argc + 3)*sizeof(*args));
 	if (!args) {
-		ERROR("failed to allocate memory for '%s'\n", name);
+		ERROR("failed to allocate memory for '%s'", name);
 		goto out;
 	}
 
@@ -114,8 +114,7 @@ int main(int argc, char *argv[])
 
 	ret = lxc_start(name, args);
 	if (ret) {
-		ERROR("failed to start '%s': %s\n", name,
-		      lxc_strerror(ret));
+		ERROR("failed to start '%s'", name);
 		goto out;
 	}
 
@@ -123,8 +122,7 @@ int main(int argc, char *argv[])
 out:
 	if (autodestroy) {
 		if (lxc_destroy(name)) {
-			ERROR("failed to destroy '%s': %s\n",
-			      name, lxc_strerror(ret));
+			ERROR("failed to destroy '%s'", name);
 			ret = 1;
 		}
 	}
diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index a60d1491d..809041e92 100644
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
 
 	err = lxc_start(name, args);
 	if (err) {
-		ERROR("failed to start : %s\n", lxc_strerror(err));
+		ERROR("failed to start '%s'", name);
 		err = 1;
 	}