From 78fd4e2b5cb3b2a5ef190ba96fa53ca5ed63c2d4 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Mon, 12 Feb 2024 16:09:34 +0100 Subject: [PATCH] Update qpdb.c to make coccinelle happy Applying semantic patch cocci/isc_mem_cget.spatch... 150 files match diff -u -p a/lib/dns/qpdb.c b/lib/dns/qpdb.c --- a/lib/dns/qpdb.c +++ b/lib/dns/qpdb.c @@ -3801,16 +3801,15 @@ dns__qpdb_create(isc_mem_t *mctx, const goto cleanup_tree_lock; } INSIST(qpdb->node_lock_count < (1 << DNS_RBT_LOCKLENGTH)); - qpdb->node_locks = isc_mem_get(mctx, qpdb->node_lock_count * - sizeof(db_nodelock_t)); + qpdb->node_locks = isc_mem_cget(mctx, qpdb->node_lock_count, + sizeof(db_nodelock_t)); qpdb->common.update_listeners = cds_lfht_new(16, 16, 0, 0, NULL); if (IS_CACHE(qpdb)) { dns_rdatasetstats_create(mctx, &qpdb->rrsetstats); - qpdb->lru = isc_mem_get(mctx, - qpdb->node_lock_count * - sizeof(dns_slabheaderlist_t)); + qpdb->lru = isc_mem_cget(mctx, qpdb->node_lock_count, + sizeof(dns_slabheaderlist_t)); for (i = 0; i < (int)qpdb->node_lock_count; i++) { ISC_LIST_INIT(qpdb->lru[i]); } @@ -3819,8 +3818,8 @@ dns__qpdb_create(isc_mem_t *mctx, const /* * Create the heaps. */ - qpdb->heaps = isc_mem_get(hmctx, qpdb->node_lock_count * - sizeof(isc_heap_t *)); + qpdb->heaps = isc_mem_cget(hmctx, qpdb->node_lock_count, + sizeof(isc_heap_t *)); for (i = 0; i < (int)qpdb->node_lock_count; i++) { qpdb->heaps[i] = NULL; } @@ -3834,8 +3833,8 @@ dns__qpdb_create(isc_mem_t *mctx, const /* * Create deadnode lists. */ - qpdb->deadnodes = isc_mem_get(mctx, qpdb->node_lock_count * - sizeof(dns_qpdatalist_t)); + qpdb->deadnodes = isc_mem_cget(mctx, qpdb->node_lock_count, + sizeof(dns_qpdatalist_t)); for (i = 0; i < (int)qpdb->node_lock_count; i++) { ISC_LIST_INIT(qpdb->deadnodes[i]); } --- lib/dns/qpdb.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/dns/qpdb.c b/lib/dns/qpdb.c index de13e83b91..7925045fd9 100644 --- a/lib/dns/qpdb.c +++ b/lib/dns/qpdb.c @@ -3782,16 +3782,15 @@ dns__qpdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, goto cleanup_tree_lock; } INSIST(qpdb->node_lock_count < (1 << DNS_RBT_LOCKLENGTH)); - qpdb->node_locks = isc_mem_get(mctx, qpdb->node_lock_count * - sizeof(db_nodelock_t)); + qpdb->node_locks = isc_mem_cget(mctx, qpdb->node_lock_count, + sizeof(db_nodelock_t)); qpdb->common.update_listeners = cds_lfht_new(16, 16, 0, 0, NULL); if (IS_CACHE(qpdb)) { dns_rdatasetstats_create(mctx, &qpdb->rrsetstats); - qpdb->lru = isc_mem_get(mctx, - qpdb->node_lock_count * - sizeof(dns_slabheaderlist_t)); + qpdb->lru = isc_mem_cget(mctx, qpdb->node_lock_count, + sizeof(dns_slabheaderlist_t)); for (i = 0; i < (int)qpdb->node_lock_count; i++) { ISC_LIST_INIT(qpdb->lru[i]); } @@ -3800,8 +3799,8 @@ dns__qpdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, /* * Create the heaps. */ - qpdb->heaps = isc_mem_get(hmctx, - qpdb->node_lock_count * sizeof(isc_heap_t *)); + qpdb->heaps = isc_mem_cget(hmctx, qpdb->node_lock_count, + sizeof(isc_heap_t *)); for (i = 0; i < (int)qpdb->node_lock_count; i++) { qpdb->heaps[i] = NULL; } @@ -3815,8 +3814,8 @@ dns__qpdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, /* * Create deadnode lists. */ - qpdb->deadnodes = isc_mem_get(mctx, qpdb->node_lock_count * - sizeof(dns_qpdatalist_t)); + qpdb->deadnodes = isc_mem_cget(mctx, qpdb->node_lock_count, + sizeof(dns_qpdatalist_t)); for (i = 0; i < (int)qpdb->node_lock_count; i++) { ISC_LIST_INIT(qpdb->deadnodes[i]); }