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

Rename some symbols in repository_plist.c.

Browse Source 
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:
Juan RP 2011-01-27 13:53:33 +01:00
parent 3ec5e27f8d
commit 1c21a98545
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/xbps-repo/find-files.c
View File

@ -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, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver); 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); XBPS_PKGFILES);
free(url); free(url);
if (pkg_filesd == NULL) { if (pkg_filesd == NULL) {

2
bin/xbps-repo/index.c
View File

@ -104,7 +104,7 @@ xbps_repo_addpkg_index(prop_dictionary_t idxdict, const char *filedir,
goto out; goto out;
} }
newpkgd = xbps_repository_get_pkg_plist_dict_from_url(file, newpkgd = xbps_repository_plist_find_pkg_dict_from_url(file,
XBPS_PKGPROPS); XBPS_PKGPROPS);
if (newpkgd == NULL) { if (newpkgd == NULL) {
fprintf(stderr, "xbps-repo: can't read %s %s metadata " fprintf(stderr, "xbps-repo: can't read %s %s metadata "

2
bin/xbps-repo/main.c
View File

@ -184,7 +184,7 @@ main(int argc, char **argv)
if (argc != 2) if (argc != 2)
usage(); usage();
pkgd = xbps_repository_get_pkg_plist_dict(argv[1], pkgd = xbps_repository_plist_find_pkg_dict(argv[1],
XBPS_PKGFILES); XBPS_PKGFILES);
if (pkgd == NULL) { if (pkgd == NULL) {
if (errno != ENOENT) { if (errno != ENOENT) {

2
bin/xbps-repo/repository.c
View File

@ -259,7 +259,7 @@ show_pkg_info_from_repolist(const char *pkgname)
} }
printf("Fetching info from: %s\n", repoloc); printf("Fetching info from: %s\n", repoloc);
pkg_propsd = 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) { if (pkg_propsd == NULL) {
free(url); free(url);
prop_object_release(pkgd); prop_object_release(pkgd);

8
include/xbps_api.h
View File

@ -779,8 +779,8 @@ prop_array_t xbps_transaction_missingdeps_get(void);
* binary package file has been found but the plist file could not * binary package file has been found but the plist file could not
* be found. * be found.
*/ */
prop_dictionary_t xbps_repository_get_pkg_plist_dict(const char *pkgname, prop_dictionary_t xbps_repository_plist_find_pkg_dict(const char *pkgname,
const char *plistf); const char *plistf);
/** /**
* Finds a plist file in a binary package file stored local or * 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. * errno is set appropiately.
*/ */
prop_dictionary_t prop_dictionary_t
xbps_repository_get_pkg_plist_dict_from_url(const char *url, xbps_repository_plist_find_pkg_dict_from_url(const char *url,
const char *plistf); const char *plistf);
/*@}*/ /*@}*/

6
lib/repository_plist.c
View File

@ -144,7 +144,7 @@ open_archive(const char *url)
} }
prop_dictionary_t 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; prop_dictionary_t plistd = NULL;
struct archive *a; struct archive *a;
@ -194,7 +194,7 @@ xbps_repository_get_pkg_plist_dict_from_url(const char *url, const char *plistf)
} }
prop_dictionary_t 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; prop_dictionary_t pkgd = NULL, plistd = NULL;
const char *repoloc; const char *repoloc;
@ -227,7 +227,7 @@ xbps_repository_get_pkg_plist_dict(const char *pkgname, const char *plistf)
errno = EINVAL; errno = EINVAL;
goto out; 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); free(url);
out: out: