]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
Fix a couple of signed/unsigned comparisons
authorMichael Schroeder <mls@suse.de>
Tue, 9 Apr 2019 09:35:31 +0000 (11:35 +0200)
committerMichael Schroeder <mls@suse.de>
Tue, 9 Apr 2019 09:35:31 +0000 (11:35 +0200)
src/pool.c
src/repo.c
src/repodata.c

index a263e9cfe075a1844b942e02f96427f39ed6cf32..a5544531e096fc082432ea56822c5f4d88e113df 100644 (file)
@@ -1312,7 +1312,7 @@ pool_addrelproviders(Pool *pool, Id d)
       POOL_DEBUG(SOLV_DEBUG_STATS, "addrelproviders: what provides %s?\n", pool_dep2str(pool, name));
 #endif
       pp = pool_whatprovides_ptr(pool, name);
-      if (!ISRELDEP(name) && name < pool->whatprovidesauxoff)
+      if (!ISRELDEP(name) && (Offset)name < pool->whatprovidesauxoff)
        ppaux = pool->whatprovidesaux[name] ? pool->whatprovidesauxdata + pool->whatprovidesaux[name] : 0;
       while (ISRELDEP(name))
        {
@@ -1926,7 +1926,7 @@ pool_set_whatprovides(Pool *pool, Id id, Id providers)
   else
     {
       pool->whatprovides[id] = providers;
-      if (id < pool->whatprovidesauxoff)
+      if ((Offset)id < pool->whatprovidesauxoff)
        pool->whatprovidesaux[id] = 0;  /* sorry */
       d = 1;
     }
index d163f13480eca2d3fa44c0ebc53e37dc086c1cc5..25fb01ba5447a9c62c0330c0fcf8a6021859e1f8 100644 (file)
@@ -391,7 +391,7 @@ repo_addid_dep_hash(Repo *repo, Offset olddeps, Id id, Id marker, int size)
   if (repo->lastidhash_idarraysize != repo->idarraysize || (Hashval)size * 2 > repo->lastidhash_mask || repo->lastmarker != marker)
     {
       repo->lastmarkerpos = 0;
-      if (size * 2 > (Hashval)repo->lastidhash_mask)
+      if ((Hashval)size * 2 > repo->lastidhash_mask)
        {
          repo->lastidhash_mask = mkmask(size < REPO_ADDID_DEP_HASHMIN ? REPO_ADDID_DEP_HASHMIN : size);
          repo->lastidhash = solv_realloc2(repo->lastidhash, repo->lastidhash_mask + 1, sizeof(Id));
index 54d5bb2391d347b477d40824bab6bb9445b920cf..e7cbbf33c9e79e57f0f37dc8c7a3add016e1bd5e 100644 (file)
@@ -1138,7 +1138,7 @@ repodata_search_array(Repodata *data, Id solvid, Id keyname, int flags, Repokey
 
   if (!dp || kv->entry != -1)
     return 0;
-  while (++kv->entry < kv->num)
+  while (++kv->entry < (int)kv->num)
     {
       if (kv->entry)
        dp = data_skip_schema(data, dp, schema);
@@ -3156,7 +3156,7 @@ compact_attrdata(Repodata *data, int entry, int nentry)
              break;
            case REPOKEY_TYPE_DIRSTRARRAY:
              for (v = attrs[1]; data->attriddata[v] ; v += 2)
-               if (data->attriddata[v + 1] < attrdatastart)
+               if ((unsigned int)data->attriddata[v + 1] < attrdatastart)
                  attrdatastart = data->attriddata[v + 1];
              /* FALLTHROUGH */
            case REPOKEY_TYPE_IDARRAY: