Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
---
 src/conf/nwfilter_params.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index 35ea0256c3..ca7b62874c 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -700,9 +700,8 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
 {
     g_autoptr(GHashTable) table = virHashNew(virNWFilterVarValueHashFree);
 
-    cur = xmlFirstElementChild(cur);
-
-    while (cur != NULL) {
+    for (cur = xmlFirstElementChild(cur); cur != NULL;
+         cur = xmlNextElementSibling(cur)) {
         if (virXMLNodeNameEqual(cur, "parameter")) {
             g_autofree char *nam = virXMLPropString(cur, "name");
             g_autofree char *val = virXMLPropString(cur, "value");
@@ -710,7 +709,6 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
 
             if (nam == NULL || !isValidVarName(nam) ||
                 val == NULL || !isValidVarValue(val)) {
-                cur = xmlNextElementSibling(cur);
                 continue;
             }
 
@@ -725,7 +723,6 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
             }
             value = NULL;
         }
-        cur = xmlNextElementSibling(cur);
     }
 
     return g_steal_pointer(&table);
-- 
2.31.1

ping

On Fri, 2021-07-23 at 11:56 +0200, Tim Wiederhake wrote:
> Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
> ---
>  src/conf/nwfilter_params.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
> index 35ea0256c3..ca7b62874c 100644
> --- a/src/conf/nwfilter_params.c
> +++ b/src/conf/nwfilter_params.c
> @@ -700,9 +700,8 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
>  {
>      g_autoptr(GHashTable) table =
> virHashNew(virNWFilterVarValueHashFree);
>  
> -    cur = xmlFirstElementChild(cur);
> -
> -    while (cur != NULL) {
> +    for (cur = xmlFirstElementChild(cur); cur != NULL;
> +         cur = xmlNextElementSibling(cur)) {
>          if (virXMLNodeNameEqual(cur, "parameter")) {
>              g_autofree char *nam = virXMLPropString(cur, "name");
>              g_autofree char *val = virXMLPropString(cur, "value");
> @@ -710,7 +709,6 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
>  
>              if (nam == NULL || !isValidVarName(nam) ||
>                  val == NULL || !isValidVarValue(val)) {
> -                cur = xmlNextElementSibling(cur);
>                  continue;
>              }
>  
> @@ -725,7 +723,6 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
>              }
>              value = NULL;
>          }
> -        cur = xmlNextElementSibling(cur);
>      }
>  
>      return g_steal_pointer(&table);

On a %A in %Y, Tim Wiederhake wrote:
> ping
> 

Sorry, I thought you already pushed it based on Peter's reply.

> On Fri, 2021-07-23 at 11:56 +0200, Tim Wiederhake wrote:
>> Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
>> ---
>>  src/conf/nwfilter_params.c | 7 ++-----
>>  1 file changed, 2 insertions(+), 5 deletions(-)
>>


Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano