Change data_fetch so that it always returns the first entry

It did something different for fix/flexarrays.

diff --git a/src/repopack.h b/src/repopack.h
index da809498b5647c0f40b370ec561117cea4ca1350..29f4babd275d9045e459a569f018f8d817ea2447 100644 (file)
--- a/src/repopack.h
+++ b/src/repopack.h
@@ -205,8 +205,14 @@ data_fetch(unsigned char *dp, KeyValue *kv, Repokey *key)
       return data_read_ideof(dp, (Id *)&kv->num2, &kv->eof);
     case REPOKEY_TYPE_FIXARRAY:
     case REPOKEY_TYPE_FLEXARRAY:
-      kv->entry = -1;
-      dp = data_read_id(dp, (Id *)&kv->num);   /* number of elements */
+      if (!kv->entry)
+       {
+          dp = data_read_id(dp, (Id *)&kv->num);       /* number of elements */
+         if (!kv->num)
+           return 0;           /* illegal */
+       }
+      if (!kv->entry || key->type == REPOKEY_TYPE_FLEXARRAY)
+        dp = data_read_id(dp, &kv->id);        /* schema */
       kv->str = (const char *)dp;
       return dp;
     default: