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

core: (refactor) Style cleanup for pkg cache state load

Browse Source 
Avoid the `goto` by initializing the output variables directly early, so we can
do a full new style consistently. Prep for unified core work.

Closes: #1104
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-11-15 14:32:21 -05:00 committed by Atomic Bot
parent b17af329bb
commit 2e5848c5f4
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1300,21 +1300,21 @@ find_pkg_in_ostree (OstreeRepo *repo,
gboolean *out_selinux_match,
GError **error)
{
gboolean in_ostree = FALSE;
gboolean selinux_match = FALSE;
g_autofree char *cached_rev = NULL;
g_autofree char *cachebranch = rpmostree_get_cache_branch_pkg (pkg);
/* Init output here, since we have several early returns */
*out_in_ostree = *out_selinux_match = FALSE;
/* NB: we're not using a pkgcache yet in the compose path */
if (repo == NULL)
goto done; /* Note early happy return */
return TRUE; /* Note early return */
g_autofree char *cachebranch = rpmostree_get_cache_branch_pkg (pkg);
g_autofree char *cached_rev = NULL;
if (!ostree_repo_resolve_rev (repo, cachebranch, TRUE,
&cached_rev, error))
return FALSE;
if (!cached_rev)
goto done; /* Note early happy return */
return TRUE; /* Note early return */
/* NB: we do an exception for LocalPackages here; we've already checked that
* its cache is valid and matches what's in the origin. We never want to fetch
@ -1336,20 +1336,18 @@ find_pkg_in_ostree (OstreeRepo *repo,
return FALSE;
if (!same_pkg_chksum)
goto done; /* Note early happy return */
return TRUE; /* Note early return */
}
in_ostree = TRUE;
/* We found an import, let's load the sepolicy state */
*out_in_ostree = TRUE;
if (sepolicy)
{
if (!commit_has_matching_sepolicy (repo, cached_rev, sepolicy,
&selinux_match, error))
out_selinux_match, error))
return FALSE;
}
done:
*out_in_ostree = in_ostree;
*out_selinux_match = selinux_match;
return TRUE;
}