Rename some symbols in repository_plist.c.
xbps_repository_get_pkg_plist_dict_from_url -> xbps_repository_plist_find_pkg_dict_from_url xbps_repository_get_pkg_plist_dict -> xbps_repository_plist_find_pkg_dict
This commit is contained in:
parent
3ec5e27f8d
commit
1c21a98545
@ -94,7 +94,7 @@ find_files_in_package(struct repository_pool_index *rpi, void *arg, bool *done)
|
||||
}
|
||||
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
|
||||
prop_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
|
||||
pkg_filesd = xbps_repository_get_pkg_plist_dict_from_url(url,
|
||||
pkg_filesd = xbps_repository_plist_find_pkg_dict_from_url(url,
|
||||
XBPS_PKGFILES);
|
||||
free(url);
|
||||
if (pkg_filesd == NULL) {
|
||||
|
@ -104,7 +104,7 @@ xbps_repo_addpkg_index(prop_dictionary_t idxdict, const char *filedir,
|
||||
goto out;
|
||||
}
|
||||
|
||||
newpkgd = xbps_repository_get_pkg_plist_dict_from_url(file,
|
||||
newpkgd = xbps_repository_plist_find_pkg_dict_from_url(file,
|
||||
XBPS_PKGPROPS);
|
||||
if (newpkgd == NULL) {
|
||||
fprintf(stderr, "xbps-repo: can't read %s %s metadata "
|
||||
|
@ -184,7 +184,7 @@ main(int argc, char **argv)
|
||||
if (argc != 2)
|
||||
usage();
|
||||
|
||||
pkgd = xbps_repository_get_pkg_plist_dict(argv[1],
|
||||
pkgd = xbps_repository_plist_find_pkg_dict(argv[1],
|
||||
XBPS_PKGFILES);
|
||||
if (pkgd == NULL) {
|
||||
if (errno != ENOENT) {
|
||||
|
@ -259,7 +259,7 @@ show_pkg_info_from_repolist(const char *pkgname)
|
||||
}
|
||||
printf("Fetching info from: %s\n", repoloc);
|
||||
pkg_propsd =
|
||||
xbps_repository_get_pkg_plist_dict_from_url(url, XBPS_PKGPROPS);
|
||||
xbps_repository_plist_find_pkg_dict_from_url(url, XBPS_PKGPROPS);
|
||||
if (pkg_propsd == NULL) {
|
||||
free(url);
|
||||
prop_object_release(pkgd);
|
||||
|
@ -779,8 +779,8 @@ prop_array_t xbps_transaction_missingdeps_get(void);
|
||||
* binary package file has been found but the plist file could not
|
||||
* be found.
|
||||
*/
|
||||
prop_dictionary_t xbps_repository_get_pkg_plist_dict(const char *pkgname,
|
||||
const char *plistf);
|
||||
prop_dictionary_t xbps_repository_plist_find_pkg_dict(const char *pkgname,
|
||||
const char *plistf);
|
||||
|
||||
/**
|
||||
* Finds a plist file in a binary package file stored local or
|
||||
@ -793,8 +793,8 @@ prop_dictionary_t xbps_repository_get_pkg_plist_dict(const char *pkgname,
|
||||
* errno is set appropiately.
|
||||
*/
|
||||
prop_dictionary_t
|
||||
xbps_repository_get_pkg_plist_dict_from_url(const char *url,
|
||||
const char *plistf);
|
||||
xbps_repository_plist_find_pkg_dict_from_url(const char *url,
|
||||
const char *plistf);
|
||||
|
||||
/*@}*/
|
||||
|
||||
|
@ -144,7 +144,7 @@ open_archive(const char *url)
|
||||
}
|
||||
|
||||
prop_dictionary_t
|
||||
xbps_repository_get_pkg_plist_dict_from_url(const char *url, const char *plistf)
|
||||
xbps_repository_plist_find_pkg_dict_from_url(const char *url, const char *plistf)
|
||||
{
|
||||
prop_dictionary_t plistd = NULL;
|
||||
struct archive *a;
|
||||
@ -194,7 +194,7 @@ xbps_repository_get_pkg_plist_dict_from_url(const char *url, const char *plistf)
|
||||
}
|
||||
|
||||
prop_dictionary_t
|
||||
xbps_repository_get_pkg_plist_dict(const char *pkgname, const char *plistf)
|
||||
xbps_repository_plist_find_pkg_dict(const char *pkgname, const char *plistf)
|
||||
{
|
||||
prop_dictionary_t pkgd = NULL, plistd = NULL;
|
||||
const char *repoloc;
|
||||
@ -227,7 +227,7 @@ xbps_repository_get_pkg_plist_dict(const char *pkgname, const char *plistf)
|
||||
errno = EINVAL;
|
||||
goto out;
|
||||
}
|
||||
plistd = xbps_repository_get_pkg_plist_dict_from_url(url, plistf);
|
||||
plistd = xbps_repository_plist_find_pkg_dict_from_url(url, plistf);
|
||||
free(url);
|
||||
|
||||
out:
|
||||
|
Loading…
Reference in New Issue
Block a user