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

Get rid of libfetch and proplib external dependencies.

Browse Source 
The list of required external deps is now confuse, libarchive and openssl.

libxbps now includes a wrapper for proplib prefixed with xbps_ rather than prop_.
This commit is contained in:
Juan RP
2013-06-20 10:26:12 +02:00
parent 31efece727
commit 42c0766c00
67 changed files with 3004 additions and 1487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/archive.c
View File

@ -108,10 +108,10 @@ uncompress_plist_data(char *xml, size_t len)
}
#undef _READ_CHUNK
prop_dictionary_t HIDDEN
xbps_dictionary_t HIDDEN
xbps_archive_get_dictionary(struct archive *ar, struct archive_entry *entry)
{
prop_dictionary_t d = NULL;
xbps_dictionary_t d = NULL;
size_t buflen;
ssize_t nbytes = -1;
char *buf, *uncomp_buf;
@ -131,8 +131,8 @@ xbps_archive_get_dictionary(struct archive *ar, struct archive_entry *entry)
}
/* If blob is already a dictionary we are done */
d = prop_dictionary_internalize(buf);
if (prop_object_type(d) == PROP_TYPE_DICTIONARY)
d = xbps_dictionary_internalize(buf);
if (xbps_object_type(d) == XBPS_TYPE_DICTIONARY)
goto out;
/* Try to uncompress blob */
@ -143,7 +143,7 @@ xbps_archive_get_dictionary(struct archive *ar, struct archive_entry *entry)
return NULL;
} else {
/* We have the uncompressed data */
d = prop_dictionary_internalize(uncomp_buf);
d = xbps_dictionary_internalize(uncomp_buf);
free(uncomp_buf);
}