homed: rename home_prepare*() → home_setup*()

[thirdparty/systemd.git] / src / home / homework-directory.c

diff --git a/src/home/homework-directory.c b/src/home/homework-directory.c
index 45a2fb9db78b72467b26f84b845b7b799033a34d..5865f325ff382f4246c74c1ee9ff0a54f1a24c90 100644 (file)
--- a/src/home/homework-directory.c
+++ b/src/home/homework-directory.c
@@ -13,7 +13,7 @@
 #include "tmpfile-util.h"
 #include "umask-util.h"
 
-int home_prepare_directory(UserRecord *h, bool already_activated, HomeSetup *setup) {
+int home_setup_directory(UserRecord *h, bool already_activated, HomeSetup *setup) {
         assert(h);
         assert(setup);
 
@@ -39,12 +39,12 @@ int home_activate_directory(
         assert(ret_home);
 
         assert_se(ipo = user_record_image_path(h));
-        ip = strdupa(ipo); /* copy out, since reconciliation might cause changing of the field */
+        ip = strdupa_safe(ipo); /* copy out, since reconciliation might cause changing of the field */
 
         assert_se(hdo = user_record_home_directory(h));
-        hd = strdupa(hdo);
+        hd = strdupa_safe(hdo);
 
-        r = home_prepare(h, false, cache, &setup, &header_home);
+        r = home_setup(h, false, cache, &setup, &header_home);
         if (r < 0)
                 return r;
 
@@ -205,7 +205,7 @@ int home_resize_directory(
         assert(ret_home);
         assert(IN_SET(user_record_storage(h), USER_DIRECTORY, USER_SUBVOLUME, USER_FSCRYPT));
 
-        r = home_prepare(h, already_activated, cache, setup, NULL);
+        r = home_setup(h, already_activated, cache, setup, NULL);
         if (r < 0)
                 return r;