From 991639da96867f9db1fd9a140f679d38156beb34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 17 Mar 2022 12:14:13 +0000 Subject: [PATCH] conf: fix inverted parameters in hash iterator callbacks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit virHashTableForEach unhelpfully has payload/key args in its callback reversed compared to g_hash_table_foreach. When converting from one to the other the semantics change but you don't get a compile error Reviewed-by: Erik Skultety Signed-off-by: Daniel P. Berrangé --- src/conf/virnwfilterobj.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index a569a52002..309f8bddb4 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -380,8 +380,8 @@ struct virNWFilterObjListData { static void -virNWFilterObjListCount(void *payload, - void *key G_GNUC_UNUSED, +virNWFilterObjListCount(void *key G_GNUC_UNUSED, + void *payload, void *opaque) { virNWFilterObj *obj = payload; @@ -417,8 +417,8 @@ struct virNWFilterNameData { static void -virNWFilterObjListCopyNames(void *payload, - void *key G_GNUC_UNUSED, +virNWFilterObjListCopyNames(void *key G_GNUC_UNUSED, + void *payload, void *opaque) { virNWFilterObj *obj = payload; @@ -460,15 +460,15 @@ struct virNWFilterListData { static void -virNWFilterObjListCollectIterator(void *payload, - void *key G_GNUC_UNUSED, +virNWFilterObjListCollectIterator(void *key G_GNUC_UNUSED, + void *payload, void *opaque) { struct virNWFilterListData *data = opaque; virNWFilterObj *obj = payload; virNWFilterObjLock(obj); - data->filters[data->nfilters++] = payload; + data->filters[data->nfilters++] = obj; }