* 5) write everything to disk
*/
int
-repo_write(Repo *repo, FILE *fp, int (*keyfilter)(Repo *repo, Repokey *key, void *kfdata), void *kfdata, Id **keyarrayp)
+repo_write(Repo *repo, FILE *fp, int (*keyfilter)(Repo *repo, Repokey *key, void *kfdata), void *kfdata, Queue *keyq)
{
Pool *pool = repo->pool;
int i, j, n;
#endif
/* copy keys if requested */
- if (keyarrayp)
+ if (keyq)
{
- *keyarrayp = solv_calloc(2 * target.nkeys + 1, sizeof(Id));
+ queue_empty(keyq);
for (i = 1; i < target.nkeys; i++)
- {
- (*keyarrayp)[2 * i - 2] = target.keys[i].name;
- (*keyarrayp)[2 * i - 1] = target.keys[i].type;
- }
+ queue_push2(keyq, target.keys[i].name, target.keys[i].type);
}
if (poolusage > 1)
if (i != n)
{
target.keys[n] = target.keys[i];
- if (keyarrayp)
+ if (keyq)
{
- (*keyarrayp)[2 * n - 2] = (*keyarrayp)[2 * i - 2];
- (*keyarrayp)[2 * n - 1] = (*keyarrayp)[2 * i - 1];
+ keyq->elements[2 * n - 2] = keyq->elements[2 * i - 2];
+ keyq->elements[2 * n - 1] = keyq->elements[2 * i - 1];
}
}
n++;
}
target.nkeys = n;
- if (keyarrayp)
- {
- /* terminate array */
- (*keyarrayp)[2 * n - 2] = 0;
- (*keyarrayp)[2 * n - 1] = 0;
- }
+ if (keyq)
+ queue_truncate(keyq, 2 * n - 2);
/* update schema data to the new key ids */
for (i = 1; i < target.schemadatalen; i++)
#include <stdio.h>
#include "repo.h"
+#include "queue.h"
-extern int repo_write(Repo *repo, FILE *fp, int (*keyfilter)(Repo *repo, Repokey *key, void *kfdata), void *kfdata, Id **keyarrayp);
+extern int repo_write(Repo *repo, FILE *fp, int (*keyfilter)(Repo *repo, Repokey *key, void *kfdata), void *kfdata, Queue *keyq);
extern int repo_write_stdkeyfilter(Repo *repo, Repokey *key, void *kfdata);
extern int repodata_write(Repodata *data , FILE *fp, int (*keyfilter)(Repo *repo, Repokey *key, void *kfdata), void *kfdata);
static void
write_info(Repo *repo, FILE *fp, int (*keyfilter)(Repo *repo, Repokey *key, void *kfdata), void *kfdata, Repodata *info, const char *location)
{
- Id h, *keyarray = 0;
- int i;
+ Id h;
+ Queue keyq;
- repo_write(repo, fp, keyfilter, kfdata, &keyarray);
+ queue_init(&keyq);
+ repo_write(repo, fp, keyfilter, kfdata, &keyq);
h = repodata_new_handle(info);
- if (keyarray)
- {
- for (i = 0; keyarray[i]; i++)
- repodata_add_idarray(info, h, REPOSITORY_KEYS, keyarray[i]);
- }
- solv_free(keyarray);
+ if (keyq.count)
+ repodata_set_idarray(info, h, REPOSITORY_KEYS, &keyq);
+ queue_free(&keyq);
repodata_set_str(info, h, REPOSITORY_LOCATION, location);
repodata_add_flexarray(info, SOLVID_META, REPOSITORY_EXTERNAL, h);
}