Add enable_disable() helper

In this patch "enabled" and "disabled" is used exclusively, but "enable" and
"disable" forms are need for the following patch.

diff --git a/src/basic/util.h b/src/basic/util.h
index 44497dcd78f5dfbac74871203a381272c023d2a6..bb2fc318ef7dfda3effe6e1f46d0177f305272da 100644 (file)
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -61,6 +61,10 @@ static inline const char* one_zero(bool b) {
         return b ? "1" : "0";
 }
 
+static inline const char* enable_disable(bool b) {
+        return b ? "enable" : "disable";
+}
+
 void execute_directories(const char* const* directories, usec_t timeout, char *argv[]);
 
 bool plymouth_running(void);

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index ff8c7a38ddf79130bbf363652bd81af0cd18b23f..a7cdf92ed2204dd049572fa307280993ccc3ebda 100644 (file)
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -1094,7 +1094,7 @@ static int verb_status(int argc, char *argv[], void *userdata) {
                 if (r < 0)
                         log_warning_errno(r, "Failed to query secure boot status: %m");
                 else
-                        printf("  Secure Boot: %s\n", r ? "enabled" : "disabled");
+                        printf("  Secure Boot: %sd\n", enable_disable(r));
 
                 r = is_efi_secure_boot_setup_mode();
                 if (r < 0)

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 35a1e55f9ee2e98e68c1fee305b11d20ec078168..f1ef90ed7a3173b904f5aab1df677caeaba45d36 100644 (file)
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -1564,7 +1564,7 @@ int main(int argc, char **argv) {
         if (r < 0)
                 log_error_errno(r, "Failed to enable watchdog: %m");
         else
-                log_debug("Watchdog is %s.", r > 0 ? "enabled" : "disabled");
+                log_debug("Watchdog is %sd.", enable_disable(r > 0));
 
         log_debug("%s running as pid "PID_FMT,
                   program_invocation_short_name, getpid());

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 82f56158be6a6d3ab01580f0354e1d950eca8d94..a0da6977073b2e442e8111f000d579b3b19f72c7 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -256,12 +256,8 @@ static int link_enable_ipv6(Link *link) {
         r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE);
         if (r < 0)
                 log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m", disabled ? "disable" : "enable", link->ifname);
-        else {
-                if (disabled)
-                        log_link_info(link, "IPv6 disabled for interface: %m");
-                else
-                        log_link_info(link, "IPv6 enabled for interface: %m");
-        }
+        else
+                log_link_info(link, "IPv6 %sd for interface: %m", enable_disable(!disabled));
 
         return 0;
 }

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index ffec609c69cb8963bc9e6f1bb00a59ba183943a9..490929e93be9a16a03ee56d739bc6fc4f22dd441 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -637,7 +637,7 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
                 return r;
 
         c->use_ntp = enabled;
-        log_info("Set NTP to %s", enabled ? "enabled" : "disabled");
+        log_info("Set NTP to %sd", enable_disable(enabled));
 
         (void) sd_bus_emit_properties_changed(sd_bus_message_get_bus(m), "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "NTP", NULL);