From 7555fc91227ef160f7a772f6c2ded27522e2a0ac Mon Sep 17 00:00:00 2001 From: Adrian Vovk Date: Thu, 14 Mar 2024 17:11:36 -0400 Subject: [PATCH] homed: Minor function name cleanup It's not actually a dbus method, just function that all the various dbus methods end up calling to update the user record. So rename it to reflect as such --- src/home/homed-home-bus.c | 4 ++-- src/home/homed-home-bus.h | 3 ++- src/home/homed-manager-bus.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/home/homed-home-bus.c b/src/home/homed-home-bus.c index 307a8912cda..624cbdb3d33 100644 --- a/src/home/homed-home-bus.c +++ b/src/home/homed-home-bus.c @@ -415,7 +415,7 @@ int bus_home_method_authenticate( return 1; } -int bus_home_method_update_record( +int bus_home_update_record( Home *h, sd_bus_message *message, UserRecord *hr, @@ -487,7 +487,7 @@ int bus_home_method_update( return r; } - return bus_home_method_update_record(h, message, hr, blobs, flags, error); + return bus_home_update_record(h, message, hr, blobs, flags, error); } int bus_home_method_resize( diff --git a/src/home/homed-home-bus.h b/src/home/homed-home-bus.h index 9cd5768279a..1644bc8066a 100644 --- a/src/home/homed-home-bus.h +++ b/src/home/homed-home-bus.h @@ -17,7 +17,6 @@ int bus_home_method_remove(sd_bus_message *message, void *userdata, sd_bus_error int bus_home_method_fixate(sd_bus_message *message, void *userdata, sd_bus_error *error); int bus_home_method_authenticate(sd_bus_message *message, void *userdata, sd_bus_error *error); int bus_home_method_update(sd_bus_message *message, void *userdata, sd_bus_error *error); -int bus_home_method_update_record(Home *home, sd_bus_message *message, UserRecord *hr, Hashmap *blobs, uint64_t flags, sd_bus_error *error); int bus_home_method_resize(sd_bus_message *message, void *userdata, sd_bus_error *error); int bus_home_method_change_password(sd_bus_message *message, void *userdata, sd_bus_error *error); int bus_home_method_lock(sd_bus_message *message, void *userdata, sd_bus_error *error); @@ -26,6 +25,8 @@ int bus_home_method_acquire(sd_bus_message *message, void *userdata, sd_bus_erro int bus_home_method_ref(sd_bus_message *message, void *userdata, sd_bus_error *error); int bus_home_method_release(sd_bus_message *message, void *userdata, sd_bus_error *error); +int bus_home_update_record(Home *home, sd_bus_message *message, UserRecord *hr, Hashmap *blobs, uint64_t flags, sd_bus_error *error); + extern const BusObjectImplementation home_object; int bus_home_path(Home *h, char **ret); diff --git a/src/home/homed-manager-bus.c b/src/home/homed-manager-bus.c index 6a3da0f01aa..403a7d0213b 100644 --- a/src/home/homed-manager-bus.c +++ b/src/home/homed-manager-bus.c @@ -592,7 +592,7 @@ static int method_update_home(sd_bus_message *message, void *userdata, sd_bus_er if (!h) return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_HOME, "No home for user %s known", hr->user_name); - return bus_home_method_update_record(h, message, hr, blobs, flags, error); + return bus_home_update_record(h, message, hr, blobs, flags, error); } static int method_resize_home(sd_bus_message *message, void *userdata, sd_bus_error *error) {