From 308045571d5f1ff3aedc1bbf4298ca75644a62e3 Mon Sep 17 00:00:00 2001
From: Michael Schroeder <mls@suse.de>
Date: Wed, 23 Feb 2022 10:37:28 +0100
Subject: [PATCH] Simplify pool_vendor2mask implementation

---
 src/poolvendor.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/poolvendor.c b/src/poolvendor.c
index 01e72f1b..83ee15bd 100644
--- a/src/poolvendor.c
+++ b/src/poolvendor.c
@@ -53,24 +53,23 @@ Id pool_vendor2mask(Pool *pool, Id vendor)
   vstr = pool_id2str(pool, vendor);
   m = 1;
   mask = 0;
-  for (v = pool->vendorclasses; ; v++)
+  for (v = pool->vendorclasses; ; )
     {
-      vs = *v;
+      vs = *v++;
       if (vs == 0)	/* end of block? */
 	{
-	  v++;
-	  if (*v == 0)
+	  vs = *v++;
+	  if (vs == 0)
 	    break;
 	  if (m == (1 << 31))
 	    break;	/* sorry, out of bits */
 	  m <<= 1;	/* next vendor equivalence class */
-	  continue;
 	}
       if (fnmatch(*vs == '!' ? vs + 1 : vs, vstr, FNM_CASEFOLD) == 0)
 	{
 	  if (*vs != '!')
 	    mask |= m;
-	  while (v[1])	/* forward to next block */
+	  while (*v)	/* forward to next block */
 	    v++;
 	}
     }
-- 
2.47.2