summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2024-11-05 18:47:54 +0100
committerLuca Boccassi <luca.boccassi@gmail.com>2024-11-05 20:32:19 +0100
commit2257be13fec7d603796f437a6ad13c3cf7934b2b (patch)
tree7303d30685a3bbe77824c519269f054fcddef42e
parentAdd PrivatePIDs= (continued) (#34940) (diff)
downloadsystemd-2257be13fec7d603796f437a6ad13c3cf7934b2b.tar.xz
systemd-2257be13fec7d603796f437a6ad13c3cf7934b2b.zip
tree-wide: time-out → timeout
For justification, see 3f9a0a522f2029e9295ea5e9984259022be88413.
-rw-r--r--NEWS6
-rw-r--r--man/crypttab.xml2
-rw-r--r--man/sd_bus_get_fd.xml4
-rw-r--r--man/sd_bus_pending_method_calls.xml2
-rw-r--r--man/sd_event_exit.xml2
-rw-r--r--man/varlinkctl.xml16
-rw-r--r--src/basic/lock-util.c4
-rw-r--r--src/core/service.c2
-rw-r--r--src/cryptsetup/cryptsetup.c2
-rw-r--r--src/libsystemd/sd-event/sd-event.c2
-rw-r--r--src/network/networkd-ndisc.c2
-rw-r--r--src/resolve/resolvectl.c2
-rw-r--r--src/resolve/resolved-dns-scope.c2
-rw-r--r--src/resolve/resolved-dns-stream.h2
14 files changed, 25 insertions, 25 deletions
diff --git a/NEWS b/NEWS
index 03f61e99c7..b7baf6050a 100644
--- a/NEWS
+++ b/NEWS
@@ -5162,7 +5162,7 @@ CHANGES WITH 250:
* A new kernel command line option systemd.watchdog_sec= is now
understood which may be used to override the hardware watchdog
- time-out for the boot.
+ timeout for the boot.
* A new setting DefaultOOMScoreAdjust= is now supported in
/etc/systemd/system.conf and /etc/systemd/user.conf. It may be used
@@ -5222,7 +5222,7 @@ CHANGES WITH 250:
variable passed to invoked processes.
* A new setting RuntimeRandomizedExtraSec= has been added for service
- and scope units that allows extending the runtime time-out as
+ and scope units that allows extending the runtime timeout as
configured by RuntimeMaxSec= with a randomized amount.
* The syntax of the service unit settings RuntimeDirectory=,
@@ -5585,7 +5585,7 @@ CHANGES WITH 250:
non-x86 architectures.
* bootctl learnt new set-timeout and set-timeout-oneshot commands that
- may be used to set the boot menu time-out of the boot loader (for all
+ may be used to set the boot menu timeout of the boot loader (for all
or just the subsequent boot).
* bootctl and kernel-install will now read variables
diff --git a/man/crypttab.xml b/man/crypttab.xml
index 8ffeaf7fcb..2ebc3bf20a 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -950,7 +950,7 @@
for supported formats). Defaults to 30s. Once the specified timeout elapsed authentication via
password is attempted. Note that this timeout applies to waiting for the security device to show up —
it does not apply to the PIN prompt for the device (should one be needed) or similar. Pass 0 to turn
- off the time-out and wait forever.</para>
+ off the timeout and wait forever.</para>
<xi:include href="version-info.xml" xpointer="v250"/></listitem>
</varlistentry>
diff --git a/man/sd_bus_get_fd.xml b/man/sd_bus_get_fd.xml
index 9d239f3294..c7bab0f955 100644
--- a/man/sd_bus_get_fd.xml
+++ b/man/sd_bus_get_fd.xml
@@ -66,8 +66,8 @@
<constant>POLLIN</constant>, <constant>POLLOUT</constant>, … events, or negative on error.
</para>
- <para><function>sd_bus_get_timeout()</function> returns the <emphasis>absolute</emphasis> time-out in μs,
- from which the relative time-out to pass to <function>poll()</function> (or a similar call) can be
+ <para><function>sd_bus_get_timeout()</function> returns the <emphasis>absolute</emphasis> timeout in μs,
+ from which the relative timeout to pass to <function>poll()</function> (or a similar call) can be
derived, when waiting for events on the specified bus connection. The returned timeout may be zero, in
which case a subsequent I/O polling call should be invoked in non-blocking mode. The returned timeout may
be <constant>UINT64_MAX</constant> in which case the I/O polling call may block indefinitely, without any
diff --git a/man/sd_bus_pending_method_calls.xml b/man/sd_bus_pending_method_calls.xml
index 063009cf94..9ed14f190f 100644
--- a/man/sd_bus_pending_method_calls.xml
+++ b/man/sd_bus_pending_method_calls.xml
@@ -40,7 +40,7 @@
<para><function>sd_bus_pending_method_calls()</function> returns the number of currently pending outgoing
method calls, i.e. method calls enqueued with
<citerefentry><refentrytitle>sd_bus_call_async</refentrytitle><manvolnum>3</manvolnum></citerefentry> for
- which no reply has been received yet, and which have not reached a time-out yet.</para>
+ which no reply has been received yet, and which have not reached a timeout yet.</para>
<para>The <parameter>bus</parameter> argument may be <constant>NULL</constant>, in which case zero is
returned.</para>
diff --git a/man/sd_event_exit.xml b/man/sd_event_exit.xml
index faa1ea992f..b01e110ca4 100644
--- a/man/sd_event_exit.xml
+++ b/man/sd_event_exit.xml
@@ -83,7 +83,7 @@
<citerefentry><refentrytitle>sd_event_add_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
…) has the effect of <function>sd_event_exit()</function> being invoked once the event source triggers,
with the specified userdata pointer cast to an integer as the exit code parameter. This is useful to
- automatically terminate an event loop after some condition, such as a time-out or reception of
+ automatically terminate an event loop after some condition, such as a timeout or reception of
<constant>SIGTERM</constant> or similar. See the documentation for the respective constructor call for
details.</para>
</refsect1>
diff --git a/man/varlinkctl.xml b/man/varlinkctl.xml
index 1f9012ec62..1e0562682f 100644
--- a/man/varlinkctl.xml
+++ b/man/varlinkctl.xml
@@ -202,19 +202,19 @@
<listitem><para>When used with <command>call</command>: expect multiple method replies. If this flag
is set the method call is sent with the <constant>more</constant> flag set, which tells the service
to generate multiple replies, if needed. The command remains running until the service sends a reply
- message that indicates it is the last in the series (or if the configured time-out is reached, see
+ message that indicates it is the last in the series (or if the configured timeout is reached, see
below). This flag should be set only for method calls that support this mechanism.</para>
<para>If this mode is enabled output is automatically switched to JSON-SEQ mode, so that individual
reply objects can be easily discerned.</para>
- <para>This switch has no effect on the method call time-out applied by default: regardless if
- <option>--more</option> is specified or not, the default time-out will be 45s. Use
- <option>--timeout=</option> (see below) to change or disable the time-out. When invoking a method
- call that continuously returns updates it is typically desirable to disable the time-out with
+ <para>This switch has no effect on the method call timeout applied by default: regardless if
+ <option>--more</option> is specified or not, the default timeout will be 45s. Use
+ <option>--timeout=</option> (see below) to change or disable the timeout. When invoking a method
+ call that continuously returns updates it is typically desirable to disable the timeout with
<option>--timeout=infinity</option>. On the other hand, when invoking a <option>--more</option>
method call for the purpose of enumerating objects (which likely will complete quickly) it is
- typically beneficial to leave the time-out logic enabled, for robustness reasons.</para>
+ typically beneficial to leave the timeout logic enabled, for robustness reasons.</para>
<xi:include href="version-info.xml" xpointer="v255"/></listitem>
</varlistentry>
@@ -300,8 +300,8 @@
<term><option>--timeout=</option></term>
<listitem>
- <para>Expects a time-out in seconds as parameter. By default a time-out of 45s is enforced. To turn
- off the time-out specify <literal>infinity</literal> or an empty string.</para>
+ <para>Expects a timeout in seconds as parameter. By default a timeout of 45s is enforced. To turn
+ off the timeout specify <literal>infinity</literal> or an empty string.</para>
<xi:include href="version-info.xml" xpointer="v257"/>
</listitem>
diff --git a/src/basic/lock-util.c b/src/basic/lock-util.c
index aef395d78e..db9905cb48 100644
--- a/src/basic/lock-util.c
+++ b/src/basic/lock-util.c
@@ -203,9 +203,9 @@ int lock_generic_with_timeout(int fd, LockType type, int operation, usec_t timeo
assert(fd >= 0);
- /* A version of lock_generic(), but with a time-out. We do this in a child process, since the kernel
+ /* A version of lock_generic(), but with a timeout. We do this in a child process, since the kernel
* APIs natively don't support a timeout. We set a SIGALRM timer that will kill the child after the
- * timeout is hit. Returns -ETIMEDOUT if the time-out is hit, and 0 on success.
+ * timeout is hit. Returns -ETIMEDOUT if the timeout is hit, and 0 on success.
*
* This only works for BSD and UNPOSIX locks, as only those are fd-bound, and hence can be acquired
* from any process that has access to the fd. POSIX locks OTOH are process-bound, and hence if we'd
diff --git a/src/core/service.c b/src/core/service.c
index a9a64938b5..5b0bb76af2 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -4736,7 +4736,7 @@ static void service_notify_message(
monotonic_usec != USEC_INFINITY &&
monotonic_usec >= s->reload_begin_usec)
/* Note, we don't call service_enter_reload_by_notify() here, because we
- * don't need reload propagation nor do we want to restart the time-out. */
+ * don't need reload propagation nor do we want to restart the timeout. */
service_set_state(s, SERVICE_RELOAD_NOTIFY);
if (s->state == SERVICE_RUNNING)
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 0620b1cffb..a415c3e6d7 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -1294,7 +1294,7 @@ static int run_security_device_monitor(
assert(event);
assert(monitor);
- /* Runs the event loop for the device monitor until either something happens, or the time-out is
+ /* Runs the event loop for the device monitor until either something happens, or the timeout is
* hit. */
for (;;) {
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index f19f579b48..7aea7d2581 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -4573,7 +4573,7 @@ static int epoll_wait_usec(
/* epoll_pwait2() was added to Linux 5.11 (2021-02-14) and to glibc in 2.35 (2022-02-03). In contrast
* to other syscalls we don't bother with our own fallback syscall wrappers on old libcs, since this
* is not that obvious to implement given the libc and kernel definitions differ in the last
- * argument. Moreover, the only reason to use it is the more accurate time-outs (which is not a
+ * argument. Moreover, the only reason to use it is the more accurate timeouts (which is not a
* biggie), let's hence rely on glibc's definitions, and fallback to epoll_pwait() when that's
* missing. */
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 677ddc6b1c..d6e36575a2 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -1278,7 +1278,7 @@ static int ndisc_router_process_onlink_prefix(Link *link, sd_ndisc_router *rt) {
*
* - If the prefix is already present in the host's Prefix List as the result of a previously
* received advertisement, reset its invalidation timer to the Valid Lifetime value in the Prefix
- * Information option. If the new Lifetime value is zero, time-out the prefix immediately. */
+ * Information option. If the new Lifetime value is zero, timeout the prefix immediately. */
if (lifetime_usec == 0) {
r = ndisc_remove_route(route, link);
if (r < 0)
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index 0dd2ca5fc7..b34ade1378 100644
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -3010,7 +3010,7 @@ static int verb_monitor(int argc, char *argv[], void *userdata) {
r = sd_varlink_set_relative_timeout(vl, USEC_INFINITY); /* We want the monitor to run basically forever */
if (r < 0)
- return log_error_errno(r, "Failed to set varlink time-out: %m");
+ return log_error_errno(r, "Failed to set varlink timeout: %m");
r = sd_varlink_attach_event(vl, event, SD_EVENT_PRIORITY_NORMAL);
if (r < 0)
diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
index 734728f905..cd16d2475e 100644
--- a/src/resolve/resolved-dns-scope.c
+++ b/src/resolve/resolved-dns-scope.c
@@ -1744,7 +1744,7 @@ int dns_type_suitable_for_protocol(uint16_t type, DnsProtocol protocol) {
/* Tests whether it makes sense to route queries for the specified DNS RR types to the specified
* protocol. For classic DNS pretty much all RR types are suitable, but for LLMNR/mDNS let's
* allowlist only a few that make sense. We use this when routing queries so that we can more quickly
- * return errors for queries that will almost certainly fail/time-out otherwise. For example, this
+ * return errors for queries that will almost certainly fail/time out otherwise. For example, this
* ensures that SOA, NS, or DS/DNSKEY queries are never routed to mDNS/LLMNR where they simply make
* no sense. */
diff --git a/src/resolve/resolved-dns-stream.h b/src/resolve/resolved-dns-stream.h
index 912b9bf431..d3de4ebf3d 100644
--- a/src/resolve/resolved-dns-stream.h
+++ b/src/resolve/resolved-dns-stream.h
@@ -15,7 +15,7 @@ typedef struct DnsStubListenerExtra DnsStubListenerExtra;
#include "resolved-dns-packet.h"
#include "resolved-dnstls.h"
-/* Various timeouts for establishing TCP connections. First the default time-out for that. */
+/* Various timeouts for establishing TCP connections. First the default timeout for that. */
#define DNS_STREAM_DEFAULT_TIMEOUT_USEC (10 * USEC_PER_SEC)
/* In the DNS stub, be more friendly for incoming connections, than we are to ourselves for outgoing ones */