hostname-util: get rid of unused parameter of hostname_cleanup()

All users are now setting lowercase=false.

diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index 21fae89fd00687caf4dbab9ed875a5d4f958ee44..95d9c3dd83bbf0a0b3bfe3efc2ff4fe1a4621dd0 100644 (file)
--- a/src/basic/hostname-util.c
+++ b/src/basic/hostname-util.c
@@ -105,7 +105,7 @@ bool hostname_is_valid(const char *s, bool relax) {
         return true;
 }
 
-char* hostname_cleanup(char *s, bool lowercase) {
+char* hostname_cleanup(char *s) {
         char *p, *d;
         bool dot;
 
@@ -119,7 +119,7 @@ char* hostname_cleanup(char *s, bool lowercase) {
                         *(d++) = '.';
                         dot = true;
                 } else if (hostname_valid_char(*p)) {
-                        *(d++) = lowercase ? tolower(*p) : *p;
+                        *(d++) = *p;
                         dot = false;
                 }
 
@@ -185,7 +185,7 @@ int read_hostname_config(const char *path, char **hostname) {
                 truncate_nl(l);
                 if (l[0] != '\0' && l[0] != '#') {
                         /* found line with value */
-                        name = hostname_cleanup(l, false);
+                        name = hostname_cleanup(l);
                         name = strdup(name);
                         if (!name)
                                 return -ENOMEM;

diff --git a/src/basic/hostname-util.h b/src/basic/hostname-util.h
index ecae3a267ce04a0d6f3294d217c6b3083e15496f..6f2b5b66ff0bd8eb8c62f14dcd35ec110de1ec20 100644 (file)
--- a/src/basic/hostname-util.h
+++ b/src/basic/hostname-util.h
@@ -30,7 +30,7 @@ bool hostname_is_set(void);
 char* gethostname_malloc(void);
 
 bool hostname_is_valid(const char *s, bool relax) _pure_;
-char* hostname_cleanup(char *s, bool lowercase);
+char* hostname_cleanup(char *s);
 
 bool is_localhost(const char *hostname);
 

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index df98212da843c335077284f2cebc94e2a415d49a..01a3d38746a0b6318d1f66594d93a6f6c5735b78 100644 (file)
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -392,7 +392,7 @@ static int prompt_hostname(void) {
                 }
 
                 /* Get rid of the trailing dot that we allow, but don't want to see */
-                arg_hostname = hostname_cleanup(h, false);
+                arg_hostname = hostname_cleanup(h);
                 h = NULL;
                 break;
         }
@@ -786,7 +786,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 return -EINVAL;
                         }
 
-                        hostname_cleanup(optarg, false);
+                        hostname_cleanup(optarg);
                         if (free_and_strdup(&arg_hostname, optarg) < 0)
                                 return log_oom();
 

diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index d194e9b629a54b175136f45a99a69fb06511ace8..dcbad99ae948ddac1a581069034a86fe465722f8 100644 (file)
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -273,13 +273,13 @@ static int set_hostname(sd_bus *bus, char **args, unsigned n) {
                 if (arg_static && hostname_is_valid(hostname, true)) {
                         p = "";
                         /* maybe get rid of trailing dot */
-                        hostname = hostname_cleanup(hostname, false);
+                        hostname = hostname_cleanup(hostname);
                 } else {
                         p = h = strdup(hostname);
                         if (!p)
                                 return log_oom();
 
-                        hostname_cleanup(hostname, false);
+                        hostname_cleanup(hostname);
                 }
 
                 r = set_simple_string(bus, "SetPrettyHostname", p);

diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 9a09f401e09876b95db47a50d10a06ed7412c934..1eb07a16810c2463de596abca0fa7091488b8660 100644 (file)
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -797,7 +797,7 @@ static int request_handler_machine(
                      "\"cutoff_to_realtime\" : \"%"PRIu64"\" }\n",
                      SD_ID128_FORMAT_VAL(mid),
                      SD_ID128_FORMAT_VAL(bid),
-                     hostname_cleanup(hostname, false),
+                     hostname_cleanup(hostname),
                      os_name ? os_name : "Linux",
                      v ? v : "bare",
                      usage,

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 073cc77711335db420a900b958243346c09ca5af..d2c0a03ccb52dabc11b965ac0dea45074d031cfe 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1527,7 +1527,7 @@ static int setup_keys(void) {
                 hn = gethostname_malloc();
 
                 if (hn) {
-                        hostname_cleanup(hn, false);
+                        hostname_cleanup(hn);
                         fprintf(stderr, "\nThe keys have been generated for host %s/" SD_ID128_FORMAT_STR ".\n", hn, SD_ID128_FORMAT_VAL(machine));
                 } else
                         fprintf(stderr, "\nThe keys have been generated for host " SD_ID128_FORMAT_STR ".\n", SD_ID128_FORMAT_VAL(machine));

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 9a19109b9fe38da9139a348606b1776567dfdfa3..6678b2c77a9e89bd79106a28865401848d0e9fb9 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -845,7 +845,7 @@ int config_parse_hostname(const char *unit,
                 return 0;
         }
 
-        *hostname = hostname_cleanup(hn, false);
+        *hostname = hostname_cleanup(hn);
 
         return 0;
 }

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 65b9a5071b9bcac040c4a5b06a5f008b810bfa41..cf77cfd22022c66628e1d7febec2e505f99b925f 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -4005,7 +4005,7 @@ static int determine_names(void) {
                 if (!arg_machine)
                         return log_oom();
 
-                hostname_cleanup(arg_machine, false);
+                hostname_cleanup(arg_machine);
                 if (!machine_name_is_valid(arg_machine)) {
                         log_error("Failed to determine machine name automatically, please use -M.");
                         return -EINVAL;

diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c
index 2357ab5758ba5dd25a2d10c52d33b5a5e2beab9d..08be3f7bf2fdc911bce7ed3b8dc1de5e7f982c79 100644 (file)
--- a/src/test/test-hostname-util.c
+++ b/src/test/test-hostname-util.c
@@ -65,37 +65,37 @@ static void test_hostname_cleanup(void) {
         char *s;
 
         s = strdupa("foobar");
-        assert_se(streq(hostname_cleanup(s, false), "foobar"));
+        assert_se(streq(hostname_cleanup(s), "foobar"));
         s = strdupa("foobar.com");
-        assert_se(streq(hostname_cleanup(s, false), "foobar.com"));
+        assert_se(streq(hostname_cleanup(s), "foobar.com"));
         s = strdupa("foobar.com.");
-        assert_se(streq(hostname_cleanup(s, false), "foobar.com"));
+        assert_se(streq(hostname_cleanup(s), "foobar.com"));
         s = strdupa("fooBAR");
-        assert_se(streq(hostname_cleanup(s, false), "fooBAR"));
+        assert_se(streq(hostname_cleanup(s), "fooBAR"));
         s = strdupa("fooBAR.com");
-        assert_se(streq(hostname_cleanup(s, false), "fooBAR.com"));
+        assert_se(streq(hostname_cleanup(s), "fooBAR.com"));
         s = strdupa("fooBAR.");
-        assert_se(streq(hostname_cleanup(s, false), "fooBAR"));
+        assert_se(streq(hostname_cleanup(s), "fooBAR"));
         s = strdupa("fooBAR.com.");
-        assert_se(streq(hostname_cleanup(s, false), "fooBAR.com"));
+        assert_se(streq(hostname_cleanup(s), "fooBAR.com"));
         s = strdupa("fööbar");
-        assert_se(streq(hostname_cleanup(s, false), "fbar"));
+        assert_se(streq(hostname_cleanup(s), "fbar"));
         s = strdupa("");
-        assert_se(isempty(hostname_cleanup(s, false)));
+        assert_se(isempty(hostname_cleanup(s)));
         s = strdupa(".");
-        assert_se(isempty(hostname_cleanup(s, false)));
+        assert_se(isempty(hostname_cleanup(s)));
         s = strdupa("..");
-        assert_se(isempty(hostname_cleanup(s, false)));
+        assert_se(isempty(hostname_cleanup(s)));
         s = strdupa("foobar.");
-        assert_se(streq(hostname_cleanup(s, false), "foobar"));
+        assert_se(streq(hostname_cleanup(s), "foobar"));
         s = strdupa(".foobar");
-        assert_se(streq(hostname_cleanup(s, false), "foobar"));
+        assert_se(streq(hostname_cleanup(s), "foobar"));
         s = strdupa("foo..bar");
-        assert_se(streq(hostname_cleanup(s, false), "foo.bar"));
+        assert_se(streq(hostname_cleanup(s), "foo.bar"));
         s = strdupa("foo.bar..");
-        assert_se(streq(hostname_cleanup(s, false), "foo.bar"));
+        assert_se(streq(hostname_cleanup(s), "foo.bar"));
         s = strdupa("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
-        assert_se(streq(hostname_cleanup(s, false), "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"));
+        assert_se(streq(hostname_cleanup(s), "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"));
 }
 
 static void test_read_hostname_config(void) {