From 694b8f7127aa01e9c06076e16731ca10249cf8c0 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 18 Mar 2021 11:13:43 +1000
Subject: [PATCH] test: fix missing va_end in case of test failures

Found by coverity

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 test/registry.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/test/registry.c b/test/registry.c
index fab3b69..25a5638 100644
--- a/test/registry.c
+++ b/test/registry.c
@@ -282,18 +282,21 @@ find_models(struct rxkb_context *ctx, ...)
     va_list args;
     const char *name;
     int idx = 0;
+    bool rc = false;
 
     va_start(args, ctx);
     name = va_arg(args, const char *);
     while(name) {
         assert(++idx < 20); /* safety guard */
         if (!find_model(ctx, name))
-            return false;
+            goto out;
         name = va_arg(args, const char *);
     };
 
+    rc = true;
+out:
     va_end(args);
-    return true;
+    return rc;
 }
 
 static struct rxkb_layout *
@@ -326,6 +329,7 @@ find_layouts(struct rxkb_context *ctx, ...)
     va_list args;
     const char *name, *variant;
     int idx = 0;
+    bool rc = false;
 
     va_start(args, ctx);
     name = va_arg(args, const char *);
@@ -333,14 +337,16 @@ find_layouts(struct rxkb_context *ctx, ...)
     while(name) {
         assert(++idx < 20); /* safety guard */
         if (!find_layout(ctx, name, variant))
-            return false;
+            goto out;
         name = va_arg(args, const char *);
         if (name)
             variant = va_arg(args, const char *);
     };
 
+    rc = true;
+out:
     va_end(args);
-    return true;
+    return rc;
 }
 
 static struct rxkb_option_group *
@@ -396,6 +402,7 @@ find_options(struct rxkb_context *ctx, ...)
     va_list args;
     const char *grp, *opt;
     int idx = 0;
+    bool rc = false;
 
     va_start(args, ctx);
     grp = va_arg(args, const char *);
@@ -403,14 +410,16 @@ find_options(struct rxkb_context *ctx, ...)
     while(grp) {
         assert(++idx < 20); /* safety guard */
         if (!find_option(ctx, grp, opt))
-            return false;
+            goto out;
         grp = va_arg(args, const char *);
         if (grp)
             opt = va_arg(args, const char *);
     };
 
+    rc = true;
+out:
     va_end(args);
-    return true;
+    return rc;
 }
 
 static bool