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/package_state.c
View File

@@ -107,7 +107,6 @@ xbps_pkg_state_installed(struct xbps_handle *xhp,
return ENOENT;
*state = get_state(pkgd);
prop_object_release(pkgd);
if (*state == 0)
return EINVAL;
@@ -203,11 +202,8 @@ xbps_set_pkg_state_installed(struct xbps_handle *xhp,
if (pkgd == NULL) {
newpkg = true;
pkgd = prop_dictionary_create();
rv = set_pkg_objs(pkgd, pkgname, version);
if (rv != 0) {
prop_object_release(pkgd);
if ((rv = set_pkg_objs(pkgd, pkgname, version)) != 0)
return rv;
}
}
if ((rv = set_new_state(pkgd, state)) != 0) {
if (newpkg)
@@ -223,8 +219,6 @@ xbps_set_pkg_state_installed(struct xbps_handle *xhp,
if ((rv = xbps_array_replace_dict_by_name(xhp->pkgdb,
pkgd, pkgname)) != 0)
return rv;
prop_object_release(pkgd);
}
}