Simplify pool_vendor2mask implementation

diff --git a/src/poolvendor.c b/src/poolvendor.c
index 01e72f1bf23e00ad7bd6cbf741aeba7a5e2aa6f5..83ee15bdcbebb15f8e54f59e5555e569040036de 100644 (file)
--- 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++;
        }
     }