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

libxbps: simplify pkgdb_get_pkgd and find_pkg_dict_installed internals.

Browse Source 
There's no need to prop_dictionary_copy the returned dictionary to
later have to free it again, just return directly the dictionary and
avoid the free(3)s.
This commit is contained in:
Juan RP
2012-06-16 09:02:07 +02:00
parent 068cab8d20
commit 974b2fe8ad
19 changed files with 28 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/repository_finddeps.c
View File

@@ -245,11 +245,8 @@ find_repo_deps(struct xbps_handle *xhp,
"pkgver", &pkgver_q);
/* Check its state */
rv = xbps_pkg_state_dictionary(tmpd, &state);
if (rv != 0) {
prop_object_release(tmpd);
if ((rv = xbps_pkg_state_dictionary(tmpd, &state)) != 0)
break;
}
if (xbps_match_virtual_pkg_in_dict(tmpd,reqpkg,true)) {
/*
* Check if required dependency is a virtual
@@ -259,7 +256,6 @@ find_repo_deps(struct xbps_handle *xhp,
xbps_dbg_printf_append(xhp,
"[virtual] satisfied by "
"`%s'.\n", pkgver_q);
prop_object_release(tmpd);
continue;
}
rv = xbps_pkgpattern_match(pkgver_q, reqpkg);
@@ -294,12 +290,10 @@ find_repo_deps(struct xbps_handle *xhp,
xbps_dbg_printf_append(xhp,
"installed "
"`%s'.\n", pkgver_q);
prop_object_release(tmpd);
continue;
}
} else {
/* error matching pkgpattern */
prop_object_release(tmpd);
xbps_dbg_printf(xhp, "failed to match "
"pattern %s with %s\n", reqpkg, pkgver_q);
break;