treewide: Correct typos and spell plural of bus consistent
This commit is contained in:
parent
4dda4e637e
commit
ff9b60f38b
|
@ -58,7 +58,7 @@
|
||||||
associated key-value pairs. Every record in the hwdb starts with one or
|
associated key-value pairs. Every record in the hwdb starts with one or
|
||||||
more match string, specifying a shell glob to compare the database
|
more match string, specifying a shell glob to compare the database
|
||||||
lookup string against. Multiple match lines are specified in additional
|
lookup string against. Multiple match lines are specified in additional
|
||||||
consecutive lines. Every match line is compared indivdually, they are
|
consecutive lines. Every match line is compared individually, they are
|
||||||
combined by OR. Every match line must start at the first character of
|
combined by OR. Every match line must start at the first character of
|
||||||
the line.</para>
|
the line.</para>
|
||||||
|
|
||||||
|
|
|
@ -90,7 +90,7 @@
|
||||||
requires a writable <filename>/etc</filename> file system and is
|
requires a writable <filename>/etc</filename> file system and is
|
||||||
fragile because the file might be edited by the administrator at
|
fragile because the file might be edited by the administrator at
|
||||||
the same time. With <command>nss-myhostname</command> enabled
|
the same time. With <command>nss-myhostname</command> enabled
|
||||||
changing <filename>/etc/hosts</filename> is unncessary, and on
|
changing <filename>/etc/hosts</filename> is unnecessary, and on
|
||||||
many systems the file becomes entirely optional.</para>
|
many systems the file becomes entirely optional.</para>
|
||||||
|
|
||||||
<para>To activate the NSS modules, <literal>myhostname</literal>
|
<para>To activate the NSS modules, <literal>myhostname</literal>
|
||||||
|
|
|
@ -453,7 +453,7 @@
|
||||||
|
|
||||||
<para>All functions that take a <parameter>char***</parameter>
|
<para>All functions that take a <parameter>char***</parameter>
|
||||||
parameter will store the answer there as an address of a an array
|
parameter will store the answer there as an address of a an array
|
||||||
of strings. Each invidividual string is NUL-terminated, and the
|
of strings. Each individual string is NUL-terminated, and the
|
||||||
array is NULL-terminated as a whole. It will be valid as long as
|
array is NULL-terminated as a whole. It will be valid as long as
|
||||||
<parameter>c</parameter> remains valid, and should not be freed or
|
<parameter>c</parameter> remains valid, and should not be freed or
|
||||||
modified by the caller.</para>
|
modified by the caller.</para>
|
||||||
|
|
|
@ -143,7 +143,7 @@
|
||||||
recommended to use <function>sd_bus_default()</function>,
|
recommended to use <function>sd_bus_default()</function>,
|
||||||
<function>sd_bus_default_user()</function>,
|
<function>sd_bus_default_user()</function>,
|
||||||
<function>sd_bus_default_system()</function> to connect to the
|
<function>sd_bus_default_system()</function> to connect to the
|
||||||
user or system busses.</para>
|
user or system buses.</para>
|
||||||
|
|
||||||
<para>If the <varname>$DBUS_SESSION_BUS_ADDRESS</varname> environment
|
<para>If the <varname>$DBUS_SESSION_BUS_ADDRESS</varname> environment
|
||||||
variable is set
|
variable is set
|
||||||
|
|
|
@ -87,7 +87,7 @@
|
||||||
Arguments corresponding to this nested sequence follow the same
|
Arguments corresponding to this nested sequence follow the same
|
||||||
rules as if they were not nested.</para>
|
rules as if they were not nested.</para>
|
||||||
|
|
||||||
<para>A variant is denoted by <literal>v</literal>. Correspoding
|
<para>A variant is denoted by <literal>v</literal>. Corresponding
|
||||||
arguments must include a format string denoting a complete type,
|
arguments must include a format string denoting a complete type,
|
||||||
and following that, arguments corresponding to the specified type.
|
and following that, arguments corresponding to the specified type.
|
||||||
</para>
|
</para>
|
||||||
|
|
|
@ -94,7 +94,7 @@
|
||||||
a global, monotonically increasing sequence number to all messages
|
a global, monotonically increasing sequence number to all messages
|
||||||
transmitted on the local system, at the time the message was sent.
|
transmitted on the local system, at the time the message was sent.
|
||||||
This sequence number is useful for determining message send order,
|
This sequence number is useful for determining message send order,
|
||||||
even across different busses of the local system. The sequence
|
even across different buses of the local system. The sequence
|
||||||
number combined with the boot ID of the system (as returned by
|
number combined with the boot ID of the system (as returned by
|
||||||
<citerefentry><refentrytitle>sd_id128_get_boot</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
|
<citerefentry><refentrytitle>sd_id128_get_boot</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
|
||||||
is a suitable globally unique identifier for bus messages.</para>
|
is a suitable globally unique identifier for bus messages.</para>
|
||||||
|
|
|
@ -95,7 +95,7 @@
|
||||||
events or a timeout. If any events are ready to be processed, it
|
events or a timeout. If any events are ready to be processed, it
|
||||||
returns a positive value, and the events should be processed with
|
returns a positive value, and the events should be processed with
|
||||||
<function>sd_event_dispatch</function>. Otherwise, the loop is
|
<function>sd_event_dispatch</function>. Otherwise, the loop is
|
||||||
back in the inital state and <function>sd_event_prepare</function>
|
back in the initial state and <function>sd_event_prepare</function>
|
||||||
should be called again.</para>
|
should be called again.</para>
|
||||||
|
|
||||||
<programlisting>
|
<programlisting>
|
||||||
|
|
|
@ -154,7 +154,7 @@
|
||||||
<command>list-dependencies</command>, i.e. follow
|
<command>list-dependencies</command>, i.e. follow
|
||||||
dependencies of type <varname>WantedBy=</varname>,
|
dependencies of type <varname>WantedBy=</varname>,
|
||||||
<varname>RequiredBy=</varname>,
|
<varname>RequiredBy=</varname>,
|
||||||
<varname>RequiredByOverrridable=</varname>,
|
<varname>RequiredByOverridable=</varname>,
|
||||||
<varname>PartOf=</varname>, <varname>BoundBy=</varname>,
|
<varname>PartOf=</varname>, <varname>BoundBy=</varname>,
|
||||||
instead of <varname>Wants=</varname> and similar.
|
instead of <varname>Wants=</varname> and similar.
|
||||||
</para>
|
</para>
|
||||||
|
|
|
@ -66,7 +66,7 @@
|
||||||
of the daemon per connection (inetd-style).
|
of the daemon per connection (inetd-style).
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
<para>The daemon to launch and its options should be specifed
|
<para>The daemon to launch and its options should be specified
|
||||||
after options intended for <command>systemd-activate</command>.
|
after options intended for <command>systemd-activate</command>.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@
|
||||||
inherited, and sockets will be passed through file descriptors 3
|
inherited, and sockets will be passed through file descriptors 3
|
||||||
and higher. Sockets passed through <varname>$LISTEN_FDS</varname>
|
and higher. Sockets passed through <varname>$LISTEN_FDS</varname>
|
||||||
to <command>systemd-activate</command> will be passed through to
|
to <command>systemd-activate</command> will be passed through to
|
||||||
the dameon, in the original positions. Other sockets specified
|
the daemon, in the original positions. Other sockets specified
|
||||||
with <option>--listen</option> will use consecutive descriptors.
|
with <option>--listen</option> will use consecutive descriptors.
|
||||||
</para>
|
</para>
|
||||||
</refsect1>
|
</refsect1>
|
||||||
|
|
|
@ -64,7 +64,7 @@
|
||||||
<filename>/usr/lib/sysctl.d/50-coredump.conf</filename> which
|
<filename>/usr/lib/sysctl.d/50-coredump.conf</filename> which
|
||||||
configures <varname>kernel.core_pattern</varname> to invoke
|
configures <varname>kernel.core_pattern</varname> to invoke
|
||||||
<command>systemd-coredump</command>. This file may be masked or
|
<command>systemd-coredump</command>. This file may be masked or
|
||||||
overriden to use a different setting following normal
|
overridden to use a different setting following normal
|
||||||
<citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> rules.</para>
|
<citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> rules.</para>
|
||||||
|
|
||||||
<para>The behaviour of a specific program upon reception of a
|
<para>The behaviour of a specific program upon reception of a
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
certain configuration files can have <literal>.d</literal>
|
certain configuration files can have <literal>.d</literal>
|
||||||
directories which contain "drop-in" files with configuration
|
directories which contain "drop-in" files with configuration
|
||||||
snippets which augment the main configuration file. "Drop-in"
|
snippets which augment the main configuration file. "Drop-in"
|
||||||
files can be overriden in the same way by placing files with the
|
files can be overridden in the same way by placing files with the
|
||||||
same name in a directory of higher priority (except that in case
|
same name in a directory of higher priority (except that in case
|
||||||
of "drop-in" files, both the "drop-in" file name and the name of
|
of "drop-in" files, both the "drop-in" file name and the name of
|
||||||
the containing directory, which corresponds to the name of the
|
the containing directory, which corresponds to the name of the
|
||||||
|
|
|
@ -156,7 +156,7 @@
|
||||||
<listitem><para>Takes the <filename>/usr</filename> filesystem
|
<listitem><para>Takes the <filename>/usr</filename> filesystem
|
||||||
mount options to use. If <varname>mount.usr=</varname> or
|
mount options to use. If <varname>mount.usr=</varname> or
|
||||||
<varname>mount.usrfstype=</varname> is set, then
|
<varname>mount.usrfstype=</varname> is set, then
|
||||||
<varname>mount.usrflages=</varname> will default to the value
|
<varname>mount.usrflags=</varname> will default to the value
|
||||||
set in <varname>rootflags=</varname>.</para>
|
set in <varname>rootflags=</varname>.</para>
|
||||||
|
|
||||||
<para>Otherwise this value will be read from the
|
<para>Otherwise this value will be read from the
|
||||||
|
|
|
@ -156,7 +156,7 @@
|
||||||
<varname>$LISTEN_FDS</varname>/<varname>$LISTEN_PID</varname>.
|
<varname>$LISTEN_FDS</varname>/<varname>$LISTEN_PID</varname>.
|
||||||
In the second case, an HTTP or HTTPS server will be spawned on
|
In the second case, an HTTP or HTTPS server will be spawned on
|
||||||
this port, respectively for <option>--listen-http</option> and
|
this port, respectively for <option>--listen-http</option> and
|
||||||
<option>--listen-https</option>. Currenntly, only POST requests
|
<option>--listen-https</option>. Currently, only POST requests
|
||||||
to <filename>/upload</filename> with <literal>Content-Type:
|
to <filename>/upload</filename> with <literal>Content-Type:
|
||||||
application/vnd.fdo.journal</literal> are supported.</para>
|
application/vnd.fdo.journal</literal> are supported.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|
|
@ -141,7 +141,7 @@
|
||||||
<replaceable>COMMAND</replaceable> specifies the program to launch
|
<replaceable>COMMAND</replaceable> specifies the program to launch
|
||||||
in the container, and the remaining arguments are used as
|
in the container, and the remaining arguments are used as
|
||||||
arguments for this program. If <option>-b</option> is not used and
|
arguments for this program. If <option>-b</option> is not used and
|
||||||
no arguments are specifed, a shell is launched in the
|
no arguments are specified, a shell is launched in the
|
||||||
container.</para>
|
container.</para>
|
||||||
|
|
||||||
<para>The following options are understood:</para>
|
<para>The following options are understood:</para>
|
||||||
|
@ -727,7 +727,7 @@
|
||||||
<programlisting># pacstrap -c -d ~/arch-tree/ base
|
<programlisting># pacstrap -c -d ~/arch-tree/ base
|
||||||
# systemd-nspawn -bD ~/arch-tree/</programlisting>
|
# systemd-nspawn -bD ~/arch-tree/</programlisting>
|
||||||
|
|
||||||
<para>This installs a mimimal Arch Linux distribution into the
|
<para>This installs a minimal Arch Linux distribution into the
|
||||||
directory <filename>~/arch-tree/</filename> and then boots an OS
|
directory <filename>~/arch-tree/</filename> and then boots an OS
|
||||||
in a namespace container in it.</para>
|
in a namespace container in it.</para>
|
||||||
</example>
|
</example>
|
||||||
|
|
|
@ -140,7 +140,7 @@
|
||||||
<listitem>
|
<listitem>
|
||||||
<para><parameter>late-dir</parameter></para>
|
<para><parameter>late-dir</parameter></para>
|
||||||
<para>argv[3] may be used to extend the unit file tree without
|
<para>argv[3] may be used to extend the unit file tree without
|
||||||
overridding any other unit files. Any native configuration
|
overriding any other unit files. Any native configuration
|
||||||
files supplied by the vendor or user/administrator take
|
files supplied by the vendor or user/administrator take
|
||||||
precedence over the generated ones placed in this directory.
|
precedence over the generated ones placed in this directory.
|
||||||
</para>
|
</para>
|
||||||
|
|
|
@ -390,7 +390,7 @@
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
</variablelist>
|
</variablelist>
|
||||||
|
|
||||||
<para>Priviledged programs (currently UID 0) may attach
|
<para>Privileged programs (currently UID 0) may attach
|
||||||
<varname>OBJECT_PID=</varname> to a message. This will instruct
|
<varname>OBJECT_PID=</varname> to a message. This will instruct
|
||||||
<command>systemd-journald</command> to attach additional fields on
|
<command>systemd-journald</command> to attach additional fields on
|
||||||
behalf of the caller:</para>
|
behalf of the caller:</para>
|
||||||
|
|
|
@ -106,7 +106,7 @@
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
<para>Some file systems have special semantics as API file systems
|
<para>Some file systems have special semantics as API file systems
|
||||||
for kernel-to-userspace and userspace-to-userpace interfaces. Some
|
for kernel-to-userspace and userspace-to-userspace interfaces. Some
|
||||||
of them may not be changed via mount units, and cannot be
|
of them may not be changed via mount units, and cannot be
|
||||||
disabled. For a longer discussion see <ulink
|
disabled. For a longer discussion see <ulink
|
||||||
url="http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API
|
url="http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API
|
||||||
|
|
|
@ -256,7 +256,7 @@
|
||||||
<para>The maximum transmission unit in bytes to set for
|
<para>The maximum transmission unit in bytes to set for
|
||||||
the device. The usual suffixes K, M, G, are supported and
|
the device. The usual suffixes K, M, G, are supported and
|
||||||
are understood to the base of 1024. This key is not
|
are understood to the base of 1024. This key is not
|
||||||
currently suported for <literal>tun</literal> or
|
currently supported for <literal>tun</literal> or
|
||||||
<literal>tap</literal> devices.
|
<literal>tap</literal> devices.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
@ -268,7 +268,7 @@
|
||||||
given, one is generated based on the interface name and
|
given, one is generated based on the interface name and
|
||||||
the
|
the
|
||||||
<citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
|
<citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
|
||||||
This key is not currently suported for
|
This key is not currently supported for
|
||||||
<literal>tun</literal> or <literal>tap</literal> devices.
|
<literal>tun</literal> or <literal>tap</literal> devices.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
@ -556,7 +556,7 @@
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>PacketInfo=</varname></term>
|
<term><varname>PacketInfo=</varname></term>
|
||||||
<listitem><para>Takes a boolean argument. Configures whether
|
<listitem><para>Takes a boolean argument. Configures whether
|
||||||
packets should be prepened with four extra bytes (two flag
|
packets should be prepended with four extra bytes (two flag
|
||||||
bytes and two protocol bytes). If disabled it indicates that
|
bytes and two protocol bytes). If disabled it indicates that
|
||||||
the packets will be pure IP packets. Defaults to
|
the packets will be pure IP packets. Defaults to
|
||||||
<literal>no</literal>.</para>
|
<literal>no</literal>.</para>
|
||||||
|
|
|
@ -513,7 +513,7 @@
|
||||||
<option>on-failure</option>, the service will be restarted
|
<option>on-failure</option>, the service will be restarted
|
||||||
when the process exits with a non-zero exit code, is
|
when the process exits with a non-zero exit code, is
|
||||||
terminated by a signal (including on core dump, but excluding
|
terminated by a signal (including on core dump, but excluding
|
||||||
the aforementiond four signals), when an operation (such as
|
the aforementioned four signals), when an operation (such as
|
||||||
service reload) times out, and when the configured watchdog
|
service reload) times out, and when the configured watchdog
|
||||||
timeout is triggered. If set to <option>on-abnormal</option>,
|
timeout is triggered. If set to <option>on-abnormal</option>,
|
||||||
the service will be restarted when the process is terminated
|
the service will be restarted when the process is terminated
|
||||||
|
@ -891,7 +891,7 @@
|
||||||
<title>Command lines</title>
|
<title>Command lines</title>
|
||||||
|
|
||||||
<para>This section describes command line parsing and
|
<para>This section describes command line parsing and
|
||||||
variable and specifier substitions for
|
variable and specifier substitutions for
|
||||||
<varname>ExecStart=</varname>,
|
<varname>ExecStart=</varname>,
|
||||||
<varname>ExecStartPre=</varname>,
|
<varname>ExecStartPre=</varname>,
|
||||||
<varname>ExecStartPost=</varname>,
|
<varname>ExecStartPost=</varname>,
|
||||||
|
@ -1131,7 +1131,7 @@ WantedBy=multi-user.target</programlisting>
|
||||||
<varname>Type=</varname><option>oneshot</option> exists. Units
|
<varname>Type=</varname><option>oneshot</option> exists. Units
|
||||||
of this type will wait until the process specified terminates
|
of this type will wait until the process specified terminates
|
||||||
and then fall back to being inactive. The following unit will
|
and then fall back to being inactive. The following unit will
|
||||||
perform a clenaup action:</para>
|
perform a cleanup action:</para>
|
||||||
|
|
||||||
<programlisting>[Unit]
|
<programlisting>[Unit]
|
||||||
Description=Cleanup old Foo data
|
Description=Cleanup old Foo data
|
||||||
|
|
|
@ -226,7 +226,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man)
|
||||||
|
|
||||||
r = manager_new(running_as, true, &m);
|
r = manager_new(running_as, true, &m);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_error_errno(r, "Failed to initalize manager: %m");
|
return log_error_errno(r, "Failed to initialize manager: %m");
|
||||||
|
|
||||||
log_debug("Starting manager...");
|
log_debug("Starting manager...");
|
||||||
|
|
||||||
|
|
|
@ -1116,7 +1116,7 @@ int bus_foreach_bus(
|
||||||
sd_bus *b;
|
sd_bus *b;
|
||||||
int r, ret = 0;
|
int r, ret = 0;
|
||||||
|
|
||||||
/* Send to all direct busses, unconditionally */
|
/* Send to all direct buses, unconditionally */
|
||||||
SET_FOREACH(b, m->private_buses, i) {
|
SET_FOREACH(b, m->private_buses, i) {
|
||||||
r = send_message(b, userdata);
|
r = send_message(b, userdata);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
|
|
|
@ -1384,7 +1384,7 @@ int main(int argc, char *argv[]) {
|
||||||
|
|
||||||
r = initialize_join_controllers();
|
r = initialize_join_controllers();
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
error_message = "Failed to initalize cgroup controllers";
|
error_message = "Failed to initialize cgroup controllers";
|
||||||
goto finish;
|
goto finish;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -753,7 +753,7 @@ static int manager_connect_bus(Manager *m, bool reexecuting) {
|
||||||
reexecuting ||
|
reexecuting ||
|
||||||
(m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS"));
|
(m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS"));
|
||||||
|
|
||||||
/* Try to connect to the busses, if possible. */
|
/* Try to connect to the buses, if possible. */
|
||||||
return bus_init(m, try_bus_connect);
|
return bus_init(m, try_bus_connect);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -993,7 +993,7 @@ g_udev_device_get_tags (GUdevDevice *device)
|
||||||
* g_udev_device_get_is_initialized:
|
* g_udev_device_get_is_initialized:
|
||||||
* @device: A #GUdevDevice.
|
* @device: A #GUdevDevice.
|
||||||
*
|
*
|
||||||
* Gets whether @device has been initalized.
|
* Gets whether @device has been initialized.
|
||||||
*
|
*
|
||||||
* Returns: Whether @device has been initialized.
|
* Returns: Whether @device has been initialized.
|
||||||
*
|
*
|
||||||
|
|
|
@ -63,7 +63,7 @@ global:
|
||||||
sd_journal_open_files;
|
sd_journal_open_files;
|
||||||
sd_journal_open_container;
|
sd_journal_open_container;
|
||||||
|
|
||||||
/* sd-dameon */
|
/* sd-daemon */
|
||||||
sd_booted;
|
sd_booted;
|
||||||
sd_is_fifo;
|
sd_is_fifo;
|
||||||
sd_is_mq;
|
sd_is_mq;
|
||||||
|
|
|
@ -1593,7 +1593,7 @@ int bus_kernel_create_bus(const char *name, bool world, char **s) {
|
||||||
|
|
||||||
make->size += ALIGN8(n->size);
|
make->size += ALIGN8(n->size);
|
||||||
|
|
||||||
/* The busses we create make no restrictions on what metadata
|
/* The buses we create make no restrictions on what metadata
|
||||||
* peers can read from incoming messages. */
|
* peers can read from incoming messages. */
|
||||||
n = KDBUS_ITEM_NEXT(n);
|
n = KDBUS_ITEM_NEXT(n);
|
||||||
n->type = KDBUS_ITEM_ATTACH_FLAGS_RECV;
|
n->type = KDBUS_ITEM_ATTACH_FLAGS_RECV;
|
||||||
|
|
|
@ -45,7 +45,7 @@ static int message_new_empty(sd_rtnl *rtnl, sd_rtnl_message **ret) {
|
||||||
|
|
||||||
/* Note that 'rtnl' is currently unused, if we start using it internally
|
/* Note that 'rtnl' is currently unused, if we start using it internally
|
||||||
we must take care to avoid problems due to mutual references between
|
we must take care to avoid problems due to mutual references between
|
||||||
busses and their queued messages. See sd-bus.
|
buses and their queued messages. See sd-bus.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
m = new0(sd_rtnl_message, 1);
|
m = new0(sd_rtnl_message, 1);
|
||||||
|
|
|
@ -77,7 +77,7 @@ typedef struct StatusInfo {
|
||||||
const char *x11_options;
|
const char *x11_options;
|
||||||
} StatusInfo;
|
} StatusInfo;
|
||||||
|
|
||||||
static void print_overriden_variables(void) {
|
static void print_overridden_variables(void) {
|
||||||
int r;
|
int r;
|
||||||
char *variables[_VARIABLE_LC_MAX] = {};
|
char *variables[_VARIABLE_LC_MAX] = {};
|
||||||
LocaleVariable j;
|
LocaleVariable j;
|
||||||
|
@ -176,7 +176,7 @@ static int show_status(sd_bus *bus, char **args, unsigned n) {
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
print_overriden_variables();
|
print_overridden_variables();
|
||||||
print_status_info(&info);
|
print_status_info(&info);
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
|
|
|
@ -138,7 +138,7 @@ int barrier_create(Barrier *b) {
|
||||||
* barrier_create(). The object is released and reset to invalid
|
* barrier_create(). The object is released and reset to invalid
|
||||||
* state. Therefore, it is safe to call barrier_destroy() multiple
|
* state. Therefore, it is safe to call barrier_destroy() multiple
|
||||||
* times or even if barrier_create() failed. However, barrier must be
|
* times or even if barrier_create() failed. However, barrier must be
|
||||||
* always initalized with BARRIER_NULL.
|
* always initialized with BARRIER_NULL.
|
||||||
*
|
*
|
||||||
* If @b is NULL, this is a no-op.
|
* If @b is NULL, this is a no-op.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -5722,10 +5722,10 @@ static int get_file_to_edit(const char *name, const char *user_home, const char
|
||||||
|
|
||||||
if (arg_runtime) {
|
if (arg_runtime) {
|
||||||
if (access(path, F_OK) >= 0)
|
if (access(path, F_OK) >= 0)
|
||||||
return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overriden by \"%s\" anyway.",
|
return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overridden by \"%s\" anyway.",
|
||||||
run, path);
|
run, path);
|
||||||
if (path2 && access(path2, F_OK) >= 0)
|
if (path2 && access(path2, F_OK) >= 0)
|
||||||
return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overriden by \"%s\" anyway.",
|
return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overridden by \"%s\" anyway.",
|
||||||
run, path2);
|
run, path2);
|
||||||
*ret_path = run;
|
*ret_path = run;
|
||||||
run = NULL;
|
run = NULL;
|
||||||
|
|
|
@ -56,7 +56,7 @@ int main(int argc, char* argv[]) {
|
||||||
log_open();
|
log_open();
|
||||||
|
|
||||||
if (getuid() != 0)
|
if (getuid() != 0)
|
||||||
log_warning("This program is unlikely to work for unpriviledged users");
|
log_warning("This program is unlikely to work for unprivileged users");
|
||||||
|
|
||||||
test_sleep();
|
test_sleep();
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,7 @@ static void override_abs(int fd, const char *devnode,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
log_debug("keyboard: %x overriden with %"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32" for \"%s\"",
|
log_debug("keyboard: %x overridden with %"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32" for \"%s\"",
|
||||||
evcode,
|
evcode,
|
||||||
absinfo.minimum, absinfo.maximum, absinfo.resolution, absinfo.fuzz, absinfo.flat,
|
absinfo.minimum, absinfo.maximum, absinfo.resolution, absinfo.fuzz, absinfo.flat,
|
||||||
devnode);
|
devnode);
|
||||||
|
|
Loading…
Reference in a new issue