From bf44928f40e7ad0a6d3288d384f8796621d4335b Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jlebon@redhat.com>
Date: Mon, 21 Mar 2016 15:41:41 -0400
Subject: [PATCH] RpmOstreeContext: remove unused params

Pull request: #240
Approved by: cgwalters
---
 src/app/rpmostree-container-builtins.c |  7 ++-----
 src/libpriv/rpmostree-core.c           | 11 +++++------
 src/libpriv/rpmostree-core.h           | 11 +++++------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/app/rpmostree-container-builtins.c b/src/app/rpmostree-container-builtins.c
index 0b5ad145..4e321a7c 100644
--- a/src/app/rpmostree-container-builtins.c
+++ b/src/app/rpmostree-container-builtins.c
@@ -104,7 +104,6 @@ roc_context_init (ROContainerContext *rocctx,
 
 static gboolean
 roc_context_prepare_for_root (ROContainerContext *rocctx,
-                              const char         *target,
                               RpmOstreeTreespec  *treespec,
                               GCancellable       *cancellable,
                               GError            **error)
@@ -285,7 +284,7 @@ rpmostree_container_builtin_assemble (int             argc,
       goto out;
     }
 
-  if (!roc_context_prepare_for_root (rocctx, target_rootdir, treespec, cancellable, error))
+  if (!roc_context_prepare_for_root (rocctx, treespec, cancellable, error))
     goto out;
 
   /* --- Downloading metadata --- */
@@ -308,7 +307,6 @@ rpmostree_container_builtin_assemble (int             argc,
     
     if (!rpmostree_context_assemble_commit (rocctx->ctx, tmpdir_dfd,
                                             name,
-                                            install,
                                             &commit,
                                             cancellable, error))
       goto out;
@@ -483,7 +481,7 @@ rpmostree_container_builtin_upgrade (int argc, char **argv, GCancellable *cancel
   else
     target_new_root = glnx_strjoina (name, ".1");
 
-  if (!roc_context_prepare_for_root (rocctx, name, treespec, cancellable, error))
+  if (!roc_context_prepare_for_root (rocctx, treespec, cancellable, error))
     goto out;
 
   /* --- Downloading metadata --- */
@@ -517,7 +515,6 @@ rpmostree_container_builtin_upgrade (int argc, char **argv, GCancellable *cancel
     
     if (!rpmostree_context_assemble_commit (rocctx->ctx, tmpdir_dfd,
                                             name,
-                                            install,
                                             &new_commit_checksum,
                                             cancellable, error))
       goto out;
diff --git a/src/libpriv/rpmostree-core.c b/src/libpriv/rpmostree-core.c
index 6c91a97d..97a2fe0a 100644
--- a/src/libpriv/rpmostree-core.c
+++ b/src/libpriv/rpmostree-core.c
@@ -1320,12 +1320,11 @@ add_to_transaction (rpmts  ts,
 
 gboolean
 rpmostree_context_assemble_commit (RpmOstreeContext *self,
-                                           int            tmpdir_dfd,
-                                           const char    *name,
-                                           RpmOstreeInstall *install,
-                                           char          **out_commit,
-                                           GCancellable  *cancellable,
-                                           GError       **error)
+                                   int               tmpdir_dfd,
+                                   const char       *name,
+                                   char            **out_commit,
+                                   GCancellable     *cancellable,
+                                   GError          **error)
 {
   gboolean ret = FALSE;
   HifContext *hifctx = self->hifctx;
diff --git a/src/libpriv/rpmostree-core.h b/src/libpriv/rpmostree-core.h
index 80f82dbe..6909e62a 100644
--- a/src/libpriv/rpmostree-core.h
+++ b/src/libpriv/rpmostree-core.h
@@ -87,9 +87,8 @@ gboolean rpmostree_context_download_import (RpmOstreeContext     *self,
                                           GError                    **error);
 
 gboolean rpmostree_context_assemble_commit (RpmOstreeContext     *self,
-                                            int                         tmpdir_dfd,
-                                            const char                 *name,
-                                            RpmOstreeInstall           *install,
-                                            char                      **out_commit,
-                                            GCancellable               *cancellable,
-                                            GError                    **error);
+                                            int                   tmpdir_dfd,
+                                            const char           *name,
+                                            char                **out_commit,
+                                            GCancellable         *cancellable,
+                                            GError              **error);