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

xbps_entry_install_conf_file: fix non debug build.

Browse Source
This commit is contained in:
Juan RP 2014-09-11 11:56:23 +02:00
parent e1124800a5
commit ed6b3c00f5
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/xbps_api_impl.h
View File

@ -158,7 +158,6 @@ int HIDDEN xbps_entry_install_conf_file(struct xbps_handle *,
xbps_dictionary_t, xbps_dictionary_t,
struct archive_entry *, struct archive_entry *,
const char *, const char *,
const char *,
const char *); const char *);
/** /**

4
lib/package_config_files.c
View File

@ -63,8 +63,7 @@ xbps_entry_install_conf_file(struct xbps_handle *xhp,
xbps_dictionary_t pkg_filesd, xbps_dictionary_t pkg_filesd,
struct archive_entry *entry, struct archive_entry *entry,
const char *entry_pname, const char *entry_pname,
const char *pkgver, const char *pkgver)
const char *pkgname)
{ {
xbps_object_t obj, obj2; xbps_object_t obj, obj2;
xbps_object_iterator_t iter, iter2; xbps_object_iterator_t iter, iter2;
@ -76,7 +75,6 @@ xbps_entry_install_conf_file(struct xbps_handle *xhp,
assert(entry); assert(entry);
assert(entry_pname); assert(entry_pname);
assert(pkgver); assert(pkgver);
assert(pkgname);
iter = xbps_array_iter_from_dict(binpkg_filesd, "conf_files"); iter = xbps_array_iter_from_dict(binpkg_filesd, "conf_files");
if (iter == NULL) if (iter == NULL)

2
lib/package_unpack.c
View File

@ -352,7 +352,7 @@ unpack_archive(struct xbps_handle *xhp,
rv = xbps_entry_install_conf_file(xhp, rv = xbps_entry_install_conf_file(xhp,
binpkg_filesd, pkg_filesd, entry, binpkg_filesd, pkg_filesd, entry,
entry_pname, pkgver, pkgname); entry_pname, pkgver);
if (rv == -1) { if (rv == -1) {
/* error */ /* error */
goto out; goto out;