- the big solv data change

  - incompatible new file format
  - repodata handles are solvable ids
  - no more extra handles
  - no need to call repodata_extend anymore
- work around solver dup repo priority bug, real fix follows soon

1 files changed, 4 insertions, 17 deletions

diff --git a/src/repopack.h b/src/repopack.h
index 9940253..bfc1425 100644
--- a/src/repopack.h
+++ b/src/repopack.h
@@ -103,9 +103,11 @@ data_fetch(unsigned char *dp, KeyValue *kv, Repokey *key)
       dp = data_read_id(dp, &kv->id);
       dp = data_read_id(dp, &kv->num);
       return data_read_ideof(dp, &kv->num2, &kv->eof);
-    case REPOKEY_TYPE_COUNTED:
+    case REPOKEY_TYPE_FIXARRAY:
       dp = data_read_id(dp, &kv->num);
       return data_read_id(dp, &kv->id);
+    case REPOKEY_TYPE_FLEXARRAY:
+      return data_read_id(dp, &kv->num);
     default:
       return 0;
     }
@@ -171,13 +173,6 @@ data_skip(unsigned char *dp, int type)
             return dp + 1;
           dp++;
         }
-    case REPOKEY_TYPE_COUNTED:
-      while ((*dp & 0x80) != 0)
-        dp++;
-      dp++;
-      while ((*dp & 0x80) != 0)
-        dp++;
-      return dp + 1;
     default:
       return 0;
     }
@@ -257,19 +252,11 @@ data_skip_verify(unsigned char *dp, int type, int maxid, int maxdir)
             return dp + 1;
           dp++;
         }
-    case REPOKEY_TYPE_COUNTED:
-      while ((*dp & 0x80) != 0)
-        dp++;
-      dp++;
-      while ((*dp & 0x80) != 0)
-        dp++;
-      return dp + 1;
     default:
       return 0;
     }
 }
 
-unsigned char * data_skip_recursive(Repodata *data, unsigned char *dp,
-				    Repokey *key);
+unsigned char *data_skip_key(Repodata *data, unsigned char *dp, Repokey *key);
 
 #endif	/* SATSOLVER_REPOPACK */