[ostree] sysroot: Drop unnecessary new sysroot object
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] sysroot: Drop unnecessary new sysroot object
- Date: Wed, 11 Mar 2015 01:51:27 +0000 (UTC)
commit c86a86f742849bd1ca5d86d747b8cde73892c3f6
Author: Colin Walters <walters verbum org>
Date: Tue Mar 10 08:41:04 2015 -0400
sysroot: Drop unnecessary new sysroot object
We're asserting that "/" is the same as our path, so we don't need to
make a new object.
src/libostree/ostree-sysroot.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
index d1fad15..baa8488 100644
--- a/src/libostree/ostree-sysroot.c
+++ b/src/libostree/ostree-sysroot.c
@@ -1014,7 +1014,6 @@ find_booted_deployment (OstreeSysroot *self,
if (g_file_equal (active_root, self->path))
{
- gs_unref_object OstreeSysroot *active_deployment_root = ostree_sysroot_new_default ();
guint i;
const char *bootlink_arg;
__attribute__((cleanup(_ostree_kernel_args_cleanup))) OstreeKernelArgs *kernel_args = NULL;
@@ -1034,7 +1033,7 @@ find_booted_deployment (OstreeSysroot *self,
for (i = 0; i < deployments->len; i++)
{
OstreeDeployment *deployment = deployments->pdata[i];
- gs_unref_object GFile *deployment_path = ostree_sysroot_get_deployment_directory
(active_deployment_root, deployment);
+ gs_unref_object GFile *deployment_path = ostree_sysroot_get_deployment_directory (self,
deployment);
guint32 device;
guint64 inode;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]