Skip to content

Commit

Permalink
daemon: Rename sysroot_reload to be more descriptive
Browse files Browse the repository at this point in the history
Follow-up to previous commit. Since we have so many concepts called
"sysroot" and "configs", let's be explicit with our naming here to be
sure we know what we're calling.

Closes: #1311
Approved by: cgwalters
  • Loading branch information
jlebon authored and rh-atomic-bot committed Mar 23, 2018
1 parent 60aa9a4 commit 747236d
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/daemon/rpmostreed-sysroot.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
#include <systemd/sd-journal.h>

static gboolean
sysroot_reload (RpmostreedSysroot *self,
gboolean *out_changed,
GError **error);
sysroot_reload_ostree_configs_and_deployments (RpmostreedSysroot *self,
gboolean *out_changed,
GError **error);

/**
* SECTION: sysroot
Expand Down Expand Up @@ -448,7 +448,7 @@ handle_reload_config (RPMOSTreeSysroot *object,
goto out;

gboolean sysroot_changed;
if (!sysroot_reload (self, &sysroot_changed, error))
if (!sysroot_reload_ostree_configs_and_deployments (self, &sysroot_changed, error))
goto out;

/* also send an UPDATED signal if configs changed to cause OS interfaces to reload; we do
Expand Down Expand Up @@ -697,9 +697,9 @@ rpmostreed_sysroot_class_init (RpmostreedSysrootClass *klass)
}

static gboolean
sysroot_reload (RpmostreedSysroot *self,
gboolean *out_changed,
GError **error)
sysroot_reload_ostree_configs_and_deployments (RpmostreedSysroot *self,
gboolean *out_changed,
GError **error)
{
gboolean ret = FALSE;
gboolean did_change;
Expand All @@ -722,7 +722,7 @@ sysroot_reload (RpmostreedSysroot *self,
gboolean
rpmostreed_sysroot_reload (RpmostreedSysroot *self, GError **error)
{
return sysroot_reload (self, NULL, error);
return sysroot_reload_ostree_configs_and_deployments (self, NULL, error);
}

static void
Expand Down

0 comments on commit 747236d

Please sign in to comment.