treewide: auto-convert the simple cases to log_*_errno()

[elogind.git] / src / core / hostname-setup.c

diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index ac508af122a3104c4cad7b049451b2e8e082527d..74ff64883f51d5224c046cb0fdfc618c88a514f2 100644 (file)
--- a/src/core/hostname-setup.c
+++ b/src/core/hostname-setup.c
@@ -42,7 +42,7 @@ static int read_and_strip_hostname(const char *path, char **hn) {
         if (r < 0)
                 return r;
 
-        hostname_cleanup(s);
+        hostname_cleanup(s, false);
 
         if (isempty(s)) {
                 free(s);
@@ -64,7 +64,7 @@ int hostname_setup(void) {
                 if (r == -ENOENT)
                         enoent = true;
                 else
-                        log_warning("Failed to read configured hostname: %s", strerror(-r));
+                        log_warning_errno(-r, "Failed to read configured hostname: %m");
 
                 hn = NULL;
         } else
@@ -82,7 +82,7 @@ int hostname_setup(void) {
                 hn = "localhost";
         }
 
-        if (sethostname(hn, strlen(hn)) < 0) {
+        if (sethostname_idempotent(hn) < 0) {
                 log_warning("Failed to set hostname to <%s>: %m", hn);
                 return -errno;
         }