[lxc-devel] [PATCH] correct asprintf error checking

[Nathan Lynch]

asprintf(3) returns -1 (not 0) on error.

Signed-off-by: Nathan Lynch <ntl at pobox.com>
---
 src/lxc/lxc_execute.c |    5 ++++-
 src/lxc/lxc_restart.c |    5 ++++-
 src/lxc/lxc_start.c   |    5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index b9020b4..669d383 100644
--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -108,7 +108,10 @@ int main(int argc, char *argv[])
 	if (my_args.rcfile)
 		rcfile = (char *)my_args.rcfile;
 	else {
-		if (!asprintf(&rcfile, LXCPATH "/%s/config", my_args.name)) {
+		int rc;
+
+		rc = asprintf(&rcfile, LXCPATH "/%s/config", my_args.name);
+		if (rc == -1) {
 			SYSERROR("failed to allocate memory");
 			return -1;
 		}
diff --git a/src/lxc/lxc_restart.c b/src/lxc/lxc_restart.c
index e44bd1b..f715a60 100644
--- a/src/lxc/lxc_restart.c
+++ b/src/lxc/lxc_restart.c
@@ -126,7 +126,10 @@ int main(int argc, char *argv[])
 	if (my_args.rcfile)
 		rcfile = (char *)my_args.rcfile;
 	else {
-		if (!asprintf(&rcfile, LXCPATH "/%s/config", my_args.name)) {
+		int rc;
+
+		rc = asprintf(&rcfile, LXCPATH "/%s/config", my_args.name);
+		if (rc == -1) {
 			SYSERROR("failed to allocate memory");
 			return -1;
 		}
diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index 5cc03db..7aa17ff 100644
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -117,7 +117,10 @@ int main(int argc, char *argv[])
 	if (my_args.rcfile)
 		rcfile = (char *)my_args.rcfile;
 	else {
-		if (!asprintf(&rcfile, LXCPATH "/%s/config", my_args.name)) {
+		int rc;
+
+		rc = asprintf(&rcfile, LXCPATH "/%s/config", my_args.name);
+		if (rc == -1) {
 			SYSERROR("failed to allocate memory");
 			return err;
 		}
-- 
1.6.6.1