From 0237c06f5361d56c3e487fb8c2a80a792215865a Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 9 Jun 2022 16:58:22 +0200 Subject: [PATCH] ostree-repo-checkout: Drop unsused arg in push/pop_path_element We want to use this with other options later, so drop the (unused) OstreeRepoCheckoutAtOptions argument. --- src/libostree/ostree-repo-checkout.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c index 663292a98f..189358efcf 100644 --- a/src/libostree/ostree-repo-checkout.c +++ b/src/libostree/ostree-repo-checkout.c @@ -852,8 +852,7 @@ push_path_element_once (GString *buf, } static inline void -push_path_element (OstreeRepoCheckoutAtOptions *options, - CheckoutState *state, +push_path_element (CheckoutState *state, const char *name, gboolean is_dir) { @@ -864,8 +863,7 @@ push_path_element (OstreeRepoCheckoutAtOptions *options, } static inline void -pop_path_element (OstreeRepoCheckoutAtOptions *options, - CheckoutState *state, +pop_path_element (CheckoutState *state, const char *name, gboolean is_dir) { @@ -1034,7 +1032,7 @@ checkout_tree_at_recurse (OstreeRepo *self, g_autoptr(GVariant) contents_csum_v = NULL; while (g_variant_iter_loop (&viter, "(&s@ay)", &fname, &contents_csum_v)) { - push_path_element (options, state, fname, FALSE); + push_path_element (state, fname, FALSE); char tmp_checksum[OSTREE_SHA256_STRING_LEN+1]; _ostree_checksum_inplace_from_bytes_v (contents_csum_v, tmp_checksum); @@ -1045,7 +1043,7 @@ checkout_tree_at_recurse (OstreeRepo *self, cancellable, error)) return FALSE; - pop_path_element (options, state, fname, FALSE); + pop_path_element (state, fname, FALSE); } contents_csum_v = NULL; /* iter_loop freed it */ } @@ -1069,7 +1067,7 @@ checkout_tree_at_recurse (OstreeRepo *self, if (!ot_util_filename_validate (dname, error)) return FALSE; - push_path_element (options, state, dname, TRUE); + push_path_element (state, dname, TRUE); char subdirtree_checksum[OSTREE_SHA256_STRING_LEN+1]; _ostree_checksum_inplace_from_bytes_v (subdirtree_csum_v, subdirtree_checksum); @@ -1081,7 +1079,7 @@ checkout_tree_at_recurse (OstreeRepo *self, cancellable, error)) return FALSE; - pop_path_element (options, state, dname, TRUE); + pop_path_element (state, dname, TRUE); } }