emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify xbps_repository_pool_find_xxx.

Browse Source
This commit is contained in:
Juan RP 2011-12-19 14:22:19 +01:00
parent c40c40e08e
commit 866c395d12
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/repository_pool_find.c
View File

@ -40,7 +40,6 @@ struct repo_pool_fpkg {
prop_dictionary_t pkgd; prop_dictionary_t pkgd;
const char *pattern; const char *pattern;
bool bypattern; bool bypattern;
bool pkgfound;
}; };
static int static int
@ -67,7 +66,6 @@ repo_find_virtualpkg_cb(struct repository_pool_index *rpi, void *arg, bool *done
prop_dictionary_set_cstring(rpf->pkgd, "repository", prop_dictionary_set_cstring(rpf->pkgd, "repository",
rpi->rpi_uri); rpi->rpi_uri);
*done = true; *done = true;
rpf->pkgfound = true;
return 0; return 0;
} }
/* not found */ /* not found */
@ -110,7 +108,6 @@ repo_find_pkg_cb(struct repository_pool_index *rpi, void *arg, bool *done)
prop_dictionary_set_cstring(rpf->pkgd, "repository", prop_dictionary_set_cstring(rpf->pkgd, "repository",
rpi->rpi_uri); rpi->rpi_uri);
*done = true; *done = true;
rpf->pkgfound = true;
return 0; return 0;
} }
/* Not found */ /* Not found */
@ -145,6 +142,7 @@ repo_find_best_pkg_cb(struct repository_pool_index *rpi,
if (instpkgd == NULL) { if (instpkgd == NULL) {
xbps_dbg_printf("[rpool] `%s' not installed, " xbps_dbg_printf("[rpool] `%s' not installed, "
"ignoring...\n", rpf->pattern); "ignoring...\n", rpf->pattern);
rpf->pkgd = NULL;
return ENODEV; return ENODEV;
} }
prop_dictionary_get_cstring_nocopy(instpkgd, prop_dictionary_get_cstring_nocopy(instpkgd,
@ -158,6 +156,7 @@ repo_find_best_pkg_cb(struct repository_pool_index *rpi,
"(installed: %s) from repository `%s'\n", "(installed: %s) from repository `%s'\n",
rpf->pattern, repover, instver, rpf->pattern, repover, instver,
rpi->rpi_uri); rpi->rpi_uri);
rpf->pkgd = NULL;
errno = EEXIST; errno = EEXIST;
return 0; return 0;
} }
@ -170,8 +169,6 @@ repo_find_best_pkg_cb(struct repository_pool_index *rpi,
prop_dictionary_set_cstring(rpf->pkgd, "repository", prop_dictionary_set_cstring(rpf->pkgd, "repository",
rpi->rpi_uri); rpi->rpi_uri);
*done = true; *done = true;
errno = 0;
rpf->pkgfound = true;
} }
return 0; return 0;
} }
@ -190,7 +187,6 @@ repo_find_pkg(const char *pkg, bool bypattern, bool best, bool virtual)
rpf->pattern = pkg; rpf->pattern = pkg;
rpf->bypattern = bypattern; rpf->bypattern = bypattern;
rpf->pkgfound = false;
rpf->pkgd = NULL; rpf->pkgd = NULL;
if (best) { if (best) {
@ -232,7 +228,7 @@ xbps_repository_pool_find_virtualpkg(const char *pkg, bool bypattern, bool best)
assert(pkg != NULL); assert(pkg != NULL);
rpf = repo_find_pkg(pkg, bypattern, best, true); rpf = repo_find_pkg(pkg, bypattern, best, true);
if (rpf->pkgfound && rpf->pkgd != NULL) if (rpf->pkgd != NULL)
pkgd = prop_dictionary_copy(rpf->pkgd); pkgd = prop_dictionary_copy(rpf->pkgd);
free(rpf); free(rpf);
@ -248,7 +244,7 @@ xbps_repository_pool_find_pkg(const char *pkg, bool bypattern, bool best)
assert(pkg != NULL); assert(pkg != NULL);
rpf = repo_find_pkg(pkg, bypattern, best, false); rpf = repo_find_pkg(pkg, bypattern, best, false);
if (rpf->pkgfound && rpf->pkgd != NULL) if (rpf->pkgd != NULL)
pkgd = prop_dictionary_copy(rpf->pkgd); pkgd = prop_dictionary_copy(rpf->pkgd);
free(rpf); free(rpf);