From: Michael Schroeder <mls@suse.de>
Date: Sat, 29 Sep 2018 07:20:48 +0000 (+0200)
Subject: Drop support for REPOKEY_TYPE_U32
X-Git-Tag: 0.7.0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbe1280bffd8b77d33edb2d9c73ebe04cf53ed20;p=thirdparty%2Flibsolv.git

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 50775e13..8e531832 100644
--- 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 a945a8f0..7249fcbd 100644
--- 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 3983bf49..8bb755f8 100644
--- 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 aa1a8400..dfc33b45 100644
--- 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 29f4babd..e63366d8 100644
--- 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 1aaee163..bdd521e6 100644
--- 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;