From: Michael Adam <obnox@samba.org>
Date: Thu, 12 Apr 2012 15:58:26 +0000 (+0200)
Subject: s3:registry: untangle assignments from checks in reg_createkey()
X-Git-Tag: samba-4.0.0alpha20~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1af68be008a11bffdf78d70c8d1635003a3c4407;p=thirdparty%2Fsamba.git

s3:registry: untangle assignments from checks in reg_createkey()

Signed-off-by: Andreas Schneider <asn@samba.org>
---

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 0bffbda5029..3d051b3f2dd 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -569,9 +569,13 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
 	char *path, *end;
 	WERROR err;
 
-	if (!(mem_ctx = talloc_new(ctx))) return WERR_NOMEM;
+	mem_ctx = talloc_new(ctx);
+	if (mem_ctx == NULL) {
+		return WERR_NOMEM;
+	}
 
-	if (!(path = talloc_strdup(mem_ctx, subkeypath))) {
+	path = talloc_strdup(mem_ctx, subkeypath);
+	if (path == NULL) {
 		err = WERR_NOMEM;
 		goto done;
 	}