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

xbps_dictionary_from_archive_entry: faster when plist is already uncompressed.

Browse Source
This commit is contained in:
Juan RP 2012-11-11 16:57:23 +01:00
parent 58333419a0
commit 2703b55f99
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/plist_archive_entry.c
View File

@ -84,15 +84,6 @@ _xbps_uncompress_plist_data(char *xml, size_t len)
rv = inflate(&strm, Z_NO_FLUSH); rv = inflate(&strm, Z_NO_FLUSH);
switch (rv) { switch (rv) {
case Z_DATA_ERROR: case Z_DATA_ERROR:
/*
* Wrong compressed data or uncompressed, try
* normal method as last resort.
*/
(void)inflateEnd(&strm);
free(uncomp_xml);
free(out);
errno = EAGAIN;
return NULL;
case Z_STREAM_ERROR: case Z_STREAM_ERROR:
case Z_NEED_DICT: case Z_NEED_DICT:
case Z_MEM_ERROR: case Z_MEM_ERROR:
@ -140,22 +131,24 @@ xbps_dictionary_from_archive_entry(struct archive *ar,
return NULL; return NULL;
} }
/* If blob is already a dictionary we are done */
d = prop_dictionary_internalize(buf);
if (prop_object_type(d) == PROP_TYPE_DICTIONARY)
goto out;
/* Try to uncompress blob */
uncomp_buf = _xbps_uncompress_plist_data(buf, buflen); uncomp_buf = _xbps_uncompress_plist_data(buf, buflen);
if (uncomp_buf == NULL) { if (uncomp_buf == NULL) {
if (errno && errno != EAGAIN) { /* Error while decompressing */
/* Error while decompressing */ free(buf);
free(buf); return NULL;
return NULL;
} else if (errno == EAGAIN) {
/* Not a compressed data, try again */
errno = 0;
d = prop_dictionary_internalize(buf);
}
} else { } else {
/* We have the uncompressed data */ /* We have the uncompressed data */
d = prop_dictionary_internalize(uncomp_buf); d = prop_dictionary_internalize(uncomp_buf);
free(uncomp_buf); free(uncomp_buf);
} }
out:
free(buf); free(buf);
return d; return d;
} }