summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/basic/meson.build3
-rw-r--r--src/core/timer.c2
-rw-r--r--src/core/unit.h2
-rw-r--r--src/libsystemd-network/sd-dhcp-lease.c2
-rw-r--r--src/network/networkd-wifi.c4
-rw-r--r--src/oom/oomd-manager.c4
-rw-r--r--src/shared/ethtool-util.c2
-rw-r--r--src/shared/format-table.h2
-rw-r--r--src/shared/wifi-util.c4
-rw-r--r--src/systemctl/systemctl-edit.c2
-rw-r--r--src/userdb/userdbctl.c4
11 files changed, 15 insertions, 16 deletions
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 6187b90732..bfe52d5879 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -389,8 +389,7 @@ filesystem_includes = ['linux/magic.h',
check_filesystems = find_program('check-filesystems.sh')
r = run_command([check_filesystems, cpp, files('filesystems-gperf.gperf')] + filesystem_includes, check: false)
if r.returncode() != 0
- error('found unknown filesystem(s) defined in kernel headers:\n\n' + r.stdout())
- r.stdout()
+ error('Unknown filesystems defined in kernel headers:\n\n' + r.stdout())
endif
filesystems_gperf_h = custom_target(
diff --git a/src/core/timer.c b/src/core/timer.c
index b89d593b75..cfc20fb613 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -821,7 +821,7 @@ static void timer_time_change(Unit *u) {
/* If we appear to have triggered in the future, the system clock must
* have been set backwards. So let's rewind our own clock and allow
- * the future trigger(s) to happen again :). Exactly the same as when
+ * the future triggers to happen again :). Exactly the same as when
* you start a timer unit with Persistent=yes. */
ts = now(CLOCK_REALTIME);
if (t->last_trigger.realtime > ts)
diff --git a/src/core/unit.h b/src/core/unit.h
index b34c59c3eb..3bc7de3d1c 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -772,7 +772,7 @@ typedef struct UnitVTable {
/* True if queued jobs of this type should be GC'ed if no other job needs them anymore */
bool gc_jobs;
- /* True if systemd-oomd can monitor and act on this unit's recursive children's cgroup(s) */
+ /* True if systemd-oomd can monitor and act on this unit's recursive children's cgroups */
bool can_set_managed_oom;
} UnitVTable;
diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index d84a356663..d9db35fbac 100644
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -608,7 +608,7 @@ static int lease_parse_6rd(sd_dhcp_lease *lease, const uint8_t *option, size_t l
memcpy(&prefix, option + 2, sizeof(struct in6_addr));
(void) in6_addr_mask(&prefix, prefixlen);
- /* 6rdBRIPv4Address: One or more IPv4 addresses of the 6rd Border Relay(s) for a given 6rd domain. */
+ /* 6rdBRIPv4Address: One or more IPv4 addresses of the 6rd Border Relays for a given 6rd domain. */
n_br_addresses = (len - 2 - sizeof(struct in6_addr)) / sizeof(struct in_addr);
br_addresses = newdup(struct in_addr, option + 2 + sizeof(struct in6_addr), n_br_addresses);
if (!br_addresses)
diff --git a/src/network/networkd-wifi.c b/src/network/networkd-wifi.c
index 13d6734a02..4bf798a9eb 100644
--- a/src/network/networkd-wifi.c
+++ b/src/network/networkd-wifi.c
@@ -123,10 +123,10 @@ int manager_genl_process_nl80211_config(sd_netlink *genl, sd_netlink_message *me
}
if (r >= 0) {
if (len == 0) {
- log_link_debug(link, "nl80211: received SSID has zero length, ignoring the received SSID: %m");
+ log_link_debug(link, "nl80211: received SSID has zero length, ignoring it: %m");
ssid = mfree(ssid);
} else if (strlen_ptr(ssid) != len) {
- log_link_debug(link, "nl80211: received SSID contains NUL character(s), ignoring the received SSID.");
+ log_link_debug(link, "nl80211: received SSID contains NUL characters, ignoring it.");
ssid = mfree(ssid);
}
}
diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c
index 51bec79ba8..4a43807b87 100644
--- a/src/oom/oomd-manager.c
+++ b/src/oom/oomd-manager.c
@@ -403,7 +403,7 @@ static int monitor_swap_contexts_handler(sd_event_source *s, uint64_t usec, void
if (r == -ENOMEM)
return log_oom();
if (r < 0)
- log_notice_errno(r, "Failed to kill any cgroup(s) based on swap: %m");
+ log_notice_errno(r, "Failed to kill any cgroups based on swap: %m");
else {
if (selected && r > 0) {
log_notice("Killed %s due to memory used (%"PRIu64") / total (%"PRIu64") and "
@@ -520,7 +520,7 @@ static int monitor_memory_pressure_contexts_handler(sd_event_source *s, uint64_t
if (r == -ENOMEM)
return log_oom();
if (r < 0)
- log_notice_errno(r, "Failed to kill any cgroup(s) under %s based on pressure: %m", t->path);
+ log_notice_errno(r, "Failed to kill any cgroups under %s based on pressure: %m", t->path);
else {
/* Don't act on all the high pressure cgroups at once; return as soon as we kill one.
* If r == 0 then it means there were not eligible candidates, the candidate cgroup
diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c
index bc51e69f85..e39b2f754b 100644
--- a/src/shared/ethtool-util.c
+++ b/src/shared/ethtool-util.c
@@ -449,7 +449,7 @@ int ethtool_set_wol(
_cleanup_free_ char *str = NULL;
(void) wol_options_to_string_alloc(wolopts & ~ecmd.supported, &str);
- log_debug("Network interface %s does not support requested Wake on LAN option(s) \"%s\", ignoring.",
+ log_debug("Network interface %s does not support requested Wake on LAN options \"%s\", ignoring.",
ifname, strna(str));
wolopts &= ecmd.supported;
diff --git a/src/shared/format-table.h b/src/shared/format-table.h
index 3a7c2774b6..c88a060dbe 100644
--- a/src/shared/format-table.h
+++ b/src/shared/format-table.h
@@ -142,7 +142,7 @@ int table_print_with_pager(Table *t, JsonFormatFlags json_format_flags, PagerFla
int table_set_json_field_name(Table *t, size_t column, const char *name);
#define table_log_add_error(r) \
- log_error_errno(r, "Failed to add cell(s) to table: %m")
+ log_error_errno(r, "Failed to add cells to table: %m")
#define table_log_print_error(r) \
log_error_errno(r, "Failed to print table: %m")
diff --git a/src/shared/wifi-util.c b/src/shared/wifi-util.c
index d32bb5d704..d4e6dcac07 100644
--- a/src/shared/wifi-util.c
+++ b/src/shared/wifi-util.c
@@ -60,10 +60,10 @@ int wifi_get_interface(sd_netlink *genl, int ifindex, enum nl80211_iftype *ret_i
return log_debug_errno(r, "Failed to get NL80211_ATTR_SSID attribute: %m");
if (r >= 0) {
if (len == 0) {
- log_debug("SSID has zero length, ignoring the received SSID.");
+ log_debug("SSID has zero length, ignoring it.");
ssid = mfree(ssid);
} else if (strlen_ptr(ssid) != len) {
- log_debug("SSID contains NUL character(s), ignoring the received SSID.");
+ log_debug("SSID contains NUL characters, ignoring it.");
ssid = mfree(ssid);
}
}
diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c
index a363d7a494..fe47f73d4a 100644
--- a/src/systemctl/systemctl-edit.c
+++ b/src/systemctl/systemctl-edit.c
@@ -367,7 +367,7 @@ static int run_editor(char **paths) {
}
}
- log_error("Cannot edit unit(s), no editor available. Please set either $SYSTEMD_EDITOR, $EDITOR or $VISUAL.");
+ log_error("Cannot edit units, no editor available. Please set either $SYSTEMD_EDITOR, $EDITOR or $VISUAL.");
_exit(EXIT_FAILURE);
}
diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index 6afec0cda2..63b0c4dde1 100644
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -1065,8 +1065,8 @@ static int help(int argc, char *argv[], void *userdata) {
"\nCommands:\n"
" user [USER…] Inspect user\n"
" group [GROUP…] Inspect group\n"
- " users-in-group [GROUP…] Show users that are members of specified group(s)\n"
- " groups-of-user [USER…] Show groups the specified user(s) is a member of\n"
+ " users-in-group [GROUP…] Show users that are members of specified groups\n"
+ " groups-of-user [USER…] Show groups the specified users are members of\n"
" services Show enabled database services\n"
" ssh-authorized-keys USER Show SSH authorized keys for user\n"
"\nOptions:\n"
View Lorry Controller Status