shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-04 17:47:03 +03:00
Code

Add enable_disable() helper

Browse Source 
In this patch "enabled" and "disabled" is used exclusively, but "enable" and
"disable" forms are need for the following patch.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-07-24 14:12:58 -04:00
parent 0fbd465f41
commit 2d37cd5356
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/basic/util.h
View File

@ -61,6 +61,10 @@ static inline const char* one_zero(bool b) {
return b ? "1" : "0"; 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[]); void execute_directories(const char* const* directories, usec_t timeout, char *argv[]);
bool plymouth_running(void); bool plymouth_running(void);

2
src/boot/bootctl.c
View File

@ -1094,7 +1094,7 @@ static int verb_status(int argc, char *argv[], void *userdata) {
if (r < 0) if (r < 0)
log_warning_errno(r, "Failed to query secure boot status: %m"); log_warning_errno(r, "Failed to query secure boot status: %m");
else else
printf(" Secure Boot: %s\n", r ? "enabled" : "disabled"); printf(" Secure Boot: %sd\n", enable_disable(r));
r = is_efi_secure_boot_setup_mode(); r = is_efi_secure_boot_setup_mode();
if (r < 0) if (r < 0)

2
src/journal-remote/journal-remote.c
View File

@ -1564,7 +1564,7 @@ int main(int argc, char **argv) {
if (r < 0) if (r < 0)
log_error_errno(r, "Failed to enable watchdog: %m"); log_error_errno(r, "Failed to enable watchdog: %m");
else 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, log_debug("%s running as pid "PID_FMT,
program_invocation_short_name, getpid()); program_invocation_short_name, getpid());

8
src/network/networkd-link.c
View File

@ -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); r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE);
if (r < 0) if (r < 0)
log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m", disabled ? "disable" : "enable", link->ifname); log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m", disabled ? "disable" : "enable", link->ifname);
else { else
if (disabled) log_link_info(link, "IPv6 %sd for interface: %m", enable_disable(!disabled));
log_link_info(link, "IPv6 disabled for interface: %m");
else
log_link_info(link, "IPv6 enabled for interface: %m");
}
return 0; return 0;
} }

2
src/timedate/timedated.c
View File

@ -637,7 +637,7 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
return r; return r;
c->use_ntp = enabled; 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); (void) sd_bus_emit_properties_changed(sd_bus_message_get_bus(m), "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "NTP", NULL);