From ffe72d28ecb568fa7d992e44bec88a1f5990eea9 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 12 Feb 2021 21:06:13 +0000
Subject: [PATCH] =?UTF-8?q?app:=20Rename=20livefs.cxx=20=E2=86=92=20apply-?=
 =?UTF-8?q?live.cxx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Continuing the renaming.
---
 Makefile-rpm-ostree.am                                 |  2 +-
 ...ltin-livefs.cxx => rpmostree-builtin-applylive.cxx} | 10 +++++-----
 src/app/rpmostree-builtin-ex.cxx                       |  4 ++--
 src/app/rpmostree-ex-builtins.h                        |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename src/app/{rpmostree-builtin-livefs.cxx => rpmostree-builtin-applylive.cxx} (95%)

diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am
index cf745d40..021b5c76 100644
--- a/Makefile-rpm-ostree.am
+++ b/Makefile-rpm-ostree.am
@@ -32,7 +32,7 @@ librpmostreeinternals_la_SOURCES = \
 	src/app/rpmostree-builtin-cliwrap.cxx \
 	src/app/rpmostree-builtin-initramfs.cxx \
 	src/app/rpmostree-builtin-initramfs-etc.cxx \
-	src/app/rpmostree-builtin-livefs.cxx \
+	src/app/rpmostree-builtin-applylive.cxx \
 	src/app/rpmostree-builtin-usroverlay.cxx \
 	src/app/rpmostree-builtin-override.cxx \
 	src/app/rpmostree-builtin-refresh-md.cxx \
diff --git a/src/app/rpmostree-builtin-livefs.cxx b/src/app/rpmostree-builtin-applylive.cxx
similarity index 95%
rename from src/app/rpmostree-builtin-livefs.cxx
rename to src/app/rpmostree-builtin-applylive.cxx
index 69cf96fb..281a0366 100644
--- a/src/app/rpmostree-builtin-livefs.cxx
+++ b/src/app/rpmostree-builtin-applylive.cxx
@@ -67,11 +67,11 @@ get_args_variant (GError **error)
 }
 
 gboolean
-rpmostree_ex_builtin_livefs (int             argc,
-                             char          **argv,
-                             RpmOstreeCommandInvocation *invocation,
-                             GCancellable   *cancellable,
-                             GError        **error)
+rpmostree_ex_builtin_apply_live (int             argc,
+                                 char          **argv,
+                                 RpmOstreeCommandInvocation *invocation,
+                                 GCancellable   *cancellable,
+                                 GError        **error)
 {
   _cleanup_peer_ GPid peer_pid = 0;
   glnx_unref_object RPMOSTreeSysroot *sysroot_proxy = NULL;
diff --git a/src/app/rpmostree-builtin-ex.cxx b/src/app/rpmostree-builtin-ex.cxx
index 0d9dc191..2c07744c 100644
--- a/src/app/rpmostree-builtin-ex.cxx
+++ b/src/app/rpmostree-builtin-ex.cxx
@@ -25,10 +25,10 @@
 static RpmOstreeCommand ex_subcommands[] = {
   { "livefs", (RpmOstreeBuiltinFlags)(RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT | RPM_OSTREE_BUILTIN_FLAG_HIDDEN),
     "Apply pending deployment changes to booted deployment",
-    rpmostree_ex_builtin_livefs },
+    rpmostree_ex_builtin_apply_live },
   { "apply-live", (RpmOstreeBuiltinFlags)RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT,
     "Apply pending deployment changes to booted deployment",
-    rpmostree_ex_builtin_livefs },
+    rpmostree_ex_builtin_apply_live },
 #ifdef BUILDOPT_ROJIG
   { "commit2rojig", (RpmOstreeBuiltinFlags)RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
     "Convert an OSTree commit into an rpm-ostree rojig", rpmostree_ex_builtin_commit2rojig },
diff --git a/src/app/rpmostree-ex-builtins.h b/src/app/rpmostree-ex-builtins.h
index 69085718..33eff2a9 100644
--- a/src/app/rpmostree-ex-builtins.h
+++ b/src/app/rpmostree-ex-builtins.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
                                                                    GCancellable *cancellable, GError **error)
 
 BUILTINPROTO(unpack);
-BUILTINPROTO(livefs);
+BUILTINPROTO(apply_live);
 #ifdef BUILDOPT_ROJIG
 BUILTINPROTO(commit2rojig);
 BUILTINPROTO(rojig2commit);