Rename: xbps_read_dict_from_archive_entry() -> xbps_dictionary_from_archive_entry().
This commit is contained in:
parent
9260c58f8a
commit
2d6140f65b
@ -93,11 +93,11 @@ int HIDDEN xbps_entry_install_conf_file(prop_dictionary_t,
|
||||
const char *);
|
||||
/**
|
||||
* @private
|
||||
* From lib/plist_entry.c
|
||||
* From lib/plist_archive_entry.c
|
||||
*/
|
||||
prop_dictionary_t HIDDEN
|
||||
xbps_read_dict_from_archive_entry(struct archive *,
|
||||
struct archive_entry *);
|
||||
xbps_dictionary_from_archive_entry(struct archive *,
|
||||
struct archive_entry *);
|
||||
|
||||
/**
|
||||
* @private
|
||||
|
@ -300,7 +300,7 @@ unpack_archive(prop_dictionary_t pkg_repod,
|
||||
* to check for obsolete files if updating a package.
|
||||
* It will be extracted to disk at the end.
|
||||
*/
|
||||
filesd = xbps_read_dict_from_archive_entry(ar, entry);
|
||||
filesd = xbps_dictionary_from_archive_entry(ar, entry);
|
||||
if (filesd == NULL) {
|
||||
rv = errno;
|
||||
goto out;
|
||||
|
@ -110,8 +110,8 @@ _xbps_uncompress_plist_data(char *xml, size_t len)
|
||||
#undef _READ_CHUNK
|
||||
|
||||
prop_dictionary_t HIDDEN
|
||||
xbps_read_dict_from_archive_entry(struct archive *ar,
|
||||
struct archive_entry *entry)
|
||||
xbps_dictionary_from_archive_entry(struct archive *ar,
|
||||
struct archive_entry *entry)
|
||||
{
|
||||
prop_dictionary_t d = NULL;
|
||||
size_t buflen = 0;
|
||||
|
@ -178,7 +178,7 @@ xbps_dictionary_metadata_plist_by_url(const char *url, const char *plistf)
|
||||
i++;
|
||||
continue;
|
||||
}
|
||||
plistd = xbps_read_dict_from_archive_entry(a, entry);
|
||||
plistd = xbps_dictionary_from_archive_entry(a, entry);
|
||||
if (plistd == NULL) {
|
||||
errno = EINVAL;
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user