dbwrap_ctdb: simplify if condition
authorRalph Boehme <slow@samba.org>
Tue, 4 Sep 2018 10:47:42 +0000 (12:47 +0200)
committerJeremy Allison <jra@samba.org>
Wed, 12 Sep 2018 20:25:19 +0000 (22:25 +0200)
This just moves the talloc_memdup() out of the if condition as per
README.Coding.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/lib/dbwrap/dbwrap_ctdb.c

index a5f27658a031065e61a183efca025fa3e8da3904..b8fedb7dcd2f4be33687aa06882205f4fa678bd6 100644 (file)
@@ -1232,12 +1232,14 @@ again:
        result->value.dsize = ctdb_data.dsize - sizeof(crec->header);
        result->value.dptr = NULL;
 
-       if ((result->value.dsize != 0)
-           && !(result->value.dptr = (uint8_t *)talloc_memdup(
-                        result, ctdb_data.dptr + sizeof(crec->header),
-                        result->value.dsize))) {
-               DEBUG(0, ("talloc failed\n"));
-               TALLOC_FREE(result);
+       if (result->value.dsize != 0) {
+               result->value.dptr = talloc_memdup(
+                       result, ctdb_data.dptr + sizeof(crec->header),
+                       result->value.dsize);
+               if (result->value.dptr == NULL) {
+                       DBG_ERR("talloc failed\n");
+                       TALLOC_FREE(result);
+               }
        }
 
        SAFE_FREE(ctdb_data.dptr);