keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

origin: avoid double lookup on hash table removals

Browse Source 
More efficient *and* prettier! So much win!

Closes: #797
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-06-05 16:21:52 -04:00 committed by Atomic Bot
parent b9f6d09f91
commit 4e2936f085
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libpriv/rpmostree-origin.c
View File

@ -478,20 +478,12 @@ rpmostree_origin_remove_packages (RpmOstreeOrigin *origin,
for (char **it = packages; it && *it; it++)
{
if (g_hash_table_contains (origin->cached_local_packages, *it))
{
g_hash_table_remove (origin->cached_local_packages, *it);
local_changed = TRUE;
}
else if (g_hash_table_contains (origin->cached_packages, *it))
{
g_hash_table_remove (origin->cached_packages, *it);
changed = TRUE;
}
if (g_hash_table_remove (origin->cached_local_packages, *it))
local_changed = TRUE;
else if (g_hash_table_remove (origin->cached_packages, *it))
changed = TRUE;
else
{
return glnx_throw (error, "Package/capability '%s' is not currently requested", *it);
}
return glnx_throw (error, "Package/capability '%s' is not currently requested", *it);
}
if (changed)
@ -540,10 +532,8 @@ rpmostree_origin_remove_overrides (RpmOstreeOrigin *origin,
for (char **it = packages; it && *it; it++)
{
const char *pkg = *it;
if (!g_hash_table_contains (origin->cached_overrides_remove, pkg))
if (!g_hash_table_remove (origin->cached_overrides_remove, pkg))
return glnx_throw (error, "No overrides for package '%s'", pkg);
g_hash_table_remove (origin->cached_overrides_remove, pkg);
changed = TRUE;
}