From a4d51cc912b028bb89bada9d158d1ae1172ecd08 Mon Sep 17 00:00:00 2001
From: Ronan Pigott <ronan@rjp.ie>
Date: Wed, 11 Dec 2024 12:47:10 -0700
Subject: [PATCH] manager: s/deserialized_subscribed/subscribed_as_strv

Now that this field may get populated at runtime, the deserialized name
is misleading. Change the name to reflect its updated purpose.

(cherry picked from commit e1315a621ae26473fcc9cd0d6013836f5f498d40)

Related: RHEL-111629
---
 src/core/dbus.c              | 6 +++---
 src/core/manager-serialize.c | 2 +-
 src/core/manager.c           | 6 +++---
 src/core/manager.h           | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/dbus.c b/src/core/dbus.c
index 12a6f2fa27..7655427f38 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -834,8 +834,8 @@ int bus_init_api(Manager *m) {
         if (r < 0)
                 return log_error_errno(r, "Failed to set up API bus: %m");
 
-        (void) bus_track_coldplug(bus, &m->subscribed, /* recursive= */ false, m->deserialized_subscribed);
-        m->deserialized_subscribed = strv_free(m->deserialized_subscribed);
+        (void) bus_track_coldplug(bus, &m->subscribed, /* recursive= */ false, m->subscribed_as_strv);
+        m->subscribed_as_strv = strv_free(m->subscribed_as_strv);
         m->api_bus = TAKE_PTR(bus);
 
         return 0;
@@ -995,7 +995,7 @@ static void destroy_bus(Manager *m, sd_bus **bus) {
                 r = bus_track_to_strv(m->subscribed, &subscribed);
                 if (r < 0)
                         log_warning_errno(r, "Failed to serialize api subscribers, ignoring: %m");
-                strv_free_and_replace(m->deserialized_subscribed, subscribed);
+                strv_free_and_replace(m->subscribed_as_strv, subscribed);
 
                 m->subscribed = sd_bus_track_unref(m->subscribed);
         }
diff --git a/src/core/manager-serialize.c b/src/core/manager-serialize.c
index f3b2d7ee16..a87d490219 100644
--- a/src/core/manager-serialize.c
+++ b/src/core/manager-serialize.c
@@ -529,7 +529,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
                         (void) exec_runtime_deserialize_one(m, val, fds);
                 else if ((val = startswith(l, "subscribed="))) {
 
-                        if (strv_extend(&m->deserialized_subscribed, val) < 0)
+                        if (strv_extend(&m->subscribed_as_strv, val) < 0)
                                 return -ENOMEM;
                 } else if ((val = startswith(l, "varlink-server-socket-address="))) {
                         if (!m->varlink_server && MANAGER_IS_SYSTEM(m)) {
diff --git a/src/core/manager.c b/src/core/manager.c
index 6c67780c99..45676d3def 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1561,7 +1561,7 @@ Manager* manager_free(Manager *m) {
         free(m->switch_root_init);
 
         sd_bus_track_unref(m->subscribed);
-        strv_free(m->deserialized_subscribed);
+        strv_free(m->subscribed_as_strv);
 
         free(m->default_smack_process_label);
 
@@ -1865,10 +1865,10 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds, const char *roo
                 manager_setup_bus(m);
 
                 /* Now that we are connected to all possible buses, let's deserialize who is tracking us. */
-                r = bus_track_coldplug(m->api_bus, &m->subscribed, false, m->deserialized_subscribed);
+                r = bus_track_coldplug(m->api_bus, &m->subscribed, false, m->subscribed_as_strv);
                 if (r < 0)
                         log_warning_errno(r, "Failed to deserialized tracked clients, ignoring: %m");
-                m->deserialized_subscribed = strv_free(m->deserialized_subscribed);
+                m->subscribed_as_strv = strv_free(m->subscribed_as_strv);
 
                 r = manager_varlink_init(m);
                 if (r < 0)
diff --git a/src/core/manager.h b/src/core/manager.h
index 86e7e40989..a96ba7bf9d 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -276,7 +276,7 @@ struct Manager {
         considered subscribes, since they last for very short only,
         and it is much simpler that way. */
         sd_bus_track *subscribed;
-        char **deserialized_subscribed;
+        char **subscribed_as_strv;
 
         /* This is used during reloading: before the reload we queue
          * the reply message here, and afterwards we send it */