ldb: Use ARRAY_DEL_ELEMENT() in ldb_kv_msg_delete_element()
authorVolker Lendecke <vl@samba.org>
Thu, 26 Mar 2020 10:06:23 +0000 (11:06 +0100)
committerRalph Boehme <slow@samba.org>
Thu, 26 Mar 2020 14:43:31 +0000 (14:43 +0000)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
lib/ldb/ldb_key_value/ldb_kv.c

index 4e7b8a116b320862e9202385a4f43abfade77903..ed0f760b5a26d51bb4c7945dd09da5bbb16ba0ec 100644 (file)
@@ -995,11 +995,7 @@ static int ldb_kv_msg_delete_element(struct ldb_module *module,
                                return ret;
                        }
 
-                       if (i<el->num_values-1) {
-                               memmove(&el->values[i], &el->values[i+1],
-                                       sizeof(el->values[i])*
-                                               (el->num_values-(i+1)));
-                       }
+                       ARRAY_DEL_ELEMENT(el->values, i, el->num_values);
                        el->num_values--;
 
                        /* per definition we find in a canonicalised message an