Drop support for REPOKEY_TYPE_U32

Six years ago we used it for the rpmdbid of installed packages.
See commit d2b47004c22a7df3b92eaa8cbbb3a42ea32d047e

diff --git a/src/knownid.h b/src/knownid.h
index 50775e1309f9cf3d2dff95bcb72a59d82ad2a1af..8e531832b2b948cf05ded7c40f11d6beaa55843d 100644 (file)
--- a/src/knownid.h
+++ b/src/knownid.h
@@ -82,7 +82,6 @@ KNOWNID(REPOKEY_TYPE_CONSTANT,                "repokey:type:constant"),
 KNOWNID(REPOKEY_TYPE_CONSTANTID,       "repokey:type:constantid"),
 KNOWNID(REPOKEY_TYPE_ID,               "repokey:type:id"),
 KNOWNID(REPOKEY_TYPE_NUM,              "repokey:type:num"),
-KNOWNID(REPOKEY_TYPE_U32,              "repokey:type:num32"),
 KNOWNID(REPOKEY_TYPE_DIR,              "repokey:type:dir"),
 KNOWNID(REPOKEY_TYPE_STR,              "repokey:type:str"),
 KNOWNID(REPOKEY_TYPE_BINARY,           "repokey:type:binary"),

diff --git a/src/repo_solv.c b/src/repo_solv.c
index a945a8f056070aaf9f0df8eb04b40f24000c35e4..7249fcbd4ee0b3b42baf5a6e45835b225a2e3537 100644 (file)
--- a/src/repo_solv.c
+++ b/src/repo_solv.c
@@ -1218,12 +1218,9 @@ printf("=> %s %s %p\n", pool_id2str(pool, keys[key].name), pool_id2str(pool, key
            }
          /* FALLTHROUGH */
        default:
-         if (id == RPM_RPMDBID && s && (keys[key].type == REPOKEY_TYPE_U32 || keys[key].type == REPOKEY_TYPE_NUM))
+         if (id == RPM_RPMDBID && s && keys[key].type == REPOKEY_TYPE_NUM)
            {
-             if (keys[key].type == REPOKEY_TYPE_U32)
-               dp = data_read_u32(dp, (unsigned int *)&id);
-             else
-               dp = data_read_id_max(dp, &id, 0, 0, &data);
+             dp = data_read_id_max(dp, &id, 0, 0, &data);
              if (!repo->rpmdbid)
                repo->rpmdbid = repo_sidedata_create(repo, sizeof(Id));
              repo->rpmdbid[(s - pool->solvables) - repo->start] = id;

diff --git a/src/repo_write.c b/src/repo_write.c
index 3983bf49f922b3808bd081247978147f02752983..8bb755f8342a5b1454ca02ca35af6a679ceab092 100644 (file)
--- a/src/repo_write.c
+++ b/src/repo_write.c
@@ -486,17 +486,6 @@ data_addblob(struct extdata *xd, unsigned char *blob, int len)
   xd->len += len;
 }
 
-static inline void
-data_addu32(struct extdata *xd, unsigned int num)
-{
-  unsigned char d[4];
-  d[0] = num >> 24;
-  d[1] = num >> 16;
-  d[2] = num >> 8;
-  d[3] = num;
-  data_addblob(xd, d, 4);
-}
-
 /* grow needid array so that it contains the specified id */
 static void
 grow_needid(struct cbdata *cbdata, Id id)
@@ -793,8 +782,6 @@ collect_data_cb(void *vcbdata, Solvable *s, Repodata *data, Repokey *key, KeyVal
       case REPOKEY_TYPE_SHA512:
        data_addblob(xd, (unsigned char *)kv->str, SIZEOF_SHA512);
        break;
-      case REPOKEY_TYPE_U32:
-       data_addu32(xd, kv->num);
        break;
       case REPOKEY_TYPE_NUM:
        data_addid64(xd, kv->num, kv->num2);

diff --git a/src/repodata.c b/src/repodata.c
index aa1a84001231a91ed80c39a51efe6ca5fc88362b..dfc33b4570d101537c8d9970599870e56407a61f 100644 (file)
--- a/src/repodata.c
+++ b/src/repodata.c
@@ -748,9 +748,6 @@ repodata_lookup_num(Repodata *data, Id solvid, Id keyname, unsigned long long no
     case REPOKEY_TYPE_NUM:
       data_read_num64(dp, &low, &high);
       return (unsigned long long)high << 32 | low;
-    case REPOKEY_TYPE_U32:
-      data_read_u32(dp, &low);
-      return low;
     case REPOKEY_TYPE_CONSTANT:
       return key->size;
     default:

diff --git a/src/repopack.h b/src/repopack.h
index 29f4babd275d9045e459a569f018f8d817ea2447..e63366d8f987a90c58ea7c7a450bca1e71513426 100644 (file)
--- a/src/repopack.h
+++ b/src/repopack.h
@@ -128,13 +128,6 @@ data_read_ideof(unsigned char *dp, Id *idp, int *eof)
     }
 }
 
-static inline unsigned char *
-data_read_u32(unsigned char *dp, unsigned int *nump)
-{
-  *nump = (dp[0] << 24) | (dp[1] << 16) | (dp[2] << 8) | dp[3];
-  return dp + 4;
-}
-
 static inline unsigned char *
 data_fetch(unsigned char *dp, KeyValue *kv, Repokey *key)
 {
@@ -161,9 +154,6 @@ data_fetch(unsigned char *dp, KeyValue *kv, Repokey *key)
       return data_read_id(dp, &kv->id);
     case REPOKEY_TYPE_NUM:
       return data_read_num64(dp, &kv->num, &kv->num2);
-    case REPOKEY_TYPE_U32:
-      kv->num2 = 0;
-      return data_read_u32(dp, &kv->num);
     case REPOKEY_TYPE_MD5:
       kv->num = 0;     /* not stringified yet */
       kv->str = (const char *)dp;
@@ -237,8 +227,6 @@ data_skip(unsigned char *dp, int type)
       while ((*dp & 0x80) != 0)
         dp++;
       return dp + 1;
-    case REPOKEY_TYPE_U32:
-      return dp + 4;
     case REPOKEY_TYPE_MD5:
       return dp + SIZEOF_MD5;
     case REPOKEY_TYPE_SHA1:

diff --git a/tools/dumpsolv.c b/tools/dumpsolv.c
index 1aaee163449b9fa64b94e8df8d5a46f4a65cd816..bdd521e62e54853baeba58cf5acbe99ccd1d64c6 100644 (file)
--- a/tools/dumpsolv.c
+++ b/tools/dumpsolv.c
@@ -54,7 +54,6 @@ dump_attr(Repo *repo, Repodata *data, Repokey *key, KeyValue *kv)
     case REPOKEY_TYPE_VOID:
       printf("%s: (void)\n", keyname);
       break;
-    case REPOKEY_TYPE_U32:
     case REPOKEY_TYPE_CONSTANT:
       printf("%s: %u\n", keyname, kv->num);
       break;
@@ -225,7 +224,6 @@ dump_attr_json(Repo *repo, Repodata *data, Repokey *key, KeyValue *kv, struct cb
     case REPOKEY_TYPE_VOID:
       printf("null");
       break;
-    case REPOKEY_TYPE_U32:
     case REPOKEY_TYPE_CONSTANT:
       printf("%u", kv->num);
       break;