int
repo_add_cudf(Repo *repo, Repo *installedrepo, FILE *fp, Queue *job, int flags)
{
- Pool *pool = repo->pool;
+ Pool *pool;
char *buf, *p;
int bufa, bufl, c;
Solvable *s;
xrepo = repo ? repo : installedrepo;
if (!xrepo)
return -1;
+ pool = xrepo->pool;
buf = solv_malloc(4096);
bufa = 4096;
while (fgets(buf + bufl, bufa - bufl, fp) > 0)
{
bufl += strlen(buf + bufl);
- if (bufl && buf[bufl - 1] != '\n')
+ if (!bufl)
+ continue;
+ if (buf[bufl - 1] != '\n')
{
if (bufa - bufl < 256)
{
}
continue;
}
- buf[--bufl] = 0;
+ buf[bufl - 1] = 0;
bufl = 0;
if (buf[0] != '@')
{
linep += strlen(linep);
if (linep == line || linep[-1] != '\n')
continue;
- *--linep = 0;
+ linep[-1] = 0;
linep = line + intag;
if (intag)
{
pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
solv_free(result);
strqueue_free(&sq);
+ fclose(fp);
return 0;
}
if (fclose(fp))
{
pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
strqueue_free(&sq);
+ fclose(fp);
return 0;
}
if (fclose(fp))
{
while (ISRELDEP(dep))
{
- Reldep *rd = rd = GETRELDEP(pool, dep);
+ Reldep *rd = GETRELDEP(pool, dep);
dep = rd->name;
}
return dep;
{
while (ISRELDEP(dep))
{
- Reldep *rd = rd = GETRELDEP(pool, dep);
+ Reldep *rd = GETRELDEP(pool, dep);
dep = rd->name;
}
return dep;
static void
dump_repodata(Repo *repo)
{
- unsigned int i;
+ int i;
Repodata *data;
if (repo->nrepodata == 0)
return;
static void
dump_repodata_json(Repo *repo, struct cbdata *cbdata)
{
- unsigned int i;
+ int i;
Repodata *data;
if (repo->nrepodata == 0)
return;