]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
libads: Save intermediate NULL checks with talloc_asprintf_addbuf()
authorVolker Lendecke <vl@samba.org>
Wed, 30 Nov 2022 13:48:33 +0000 (14:48 +0100)
committerJeremy Allison <jra@samba.org>
Wed, 14 Dec 2022 05:29:51 +0000 (05:29 +0000)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Dec 14 05:29:51 UTC 2022 on sn-devel-184

source3/libads/ldap_schema.c

index 85b322c1fe2ca3c5c2fc982455d8f98c3ddece84..d2f486e4918e86550c0a4cd3c56a77658bae0f54 100644 (file)
@@ -49,19 +49,14 @@ static ADS_STATUS ads_get_attrnames_by_oids(ADS_STRUCT *ads,
                return ADS_ERROR_NT(NT_STATUS_NONE_MAPPED);
        }
 
-       if ((expr = talloc_asprintf(mem_ctx, "(|")) == NULL) {
-               return ADS_ERROR(LDAP_NO_MEMORY);
-       }
+       expr = talloc_asprintf(mem_ctx, "(|");
 
        for (i=0; i<num_OIDs; i++) {
-
-               if ((expr = talloc_asprintf_append_buffer(expr, "(attributeId=%s)",
-                                                  OIDs[i])) == NULL) {
-                       return ADS_ERROR(LDAP_NO_MEMORY);
-               }
+               talloc_asprintf_addbuf(&expr, "(attributeId=%s)", OIDs[i]);
        }
 
-       if ((expr = talloc_asprintf_append_buffer(expr, ")")) == NULL) {
+       talloc_asprintf_addbuf(&expr, ")");
+       if (expr == NULL) {
                return ADS_ERROR(LDAP_NO_MEMORY);
        }