[systemd-commits] 7 commits - Makefile.am man/bootup.xml man/crypttab.xml man/daemon.xml man/halt.xml man/journalctl.xml man/kernel-command-line.xml man/locale.conf.xml man/logind.conf.xml man/os-release.xml man/pam_systemd.xml man/sd-daemon.xml man/sd_booted.xml man/sd_is_fifo.xml man/sd_journal_print.xml man/sd_listen_fds.xml man/sd_notify.xml man/sd_seat_get_active.xml man/systemctl.xml man/systemd.device.xml man/systemd.exec.xml man/systemd.service.xml man/systemd.socket.xml man/systemd.unit.xml src/core src/journal src/libudev src/python-systemd src/systemd src/udev test/test-functions
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Sep 13 11:09:11 PDT 2012
Makefile.am | 1 -
man/bootup.xml | 2 +-
man/crypttab.xml | 8 ++++----
man/daemon.xml | 10 +++++-----
man/halt.xml | 6 +++---
man/journalctl.xml | 12 ++++++------
man/kernel-command-line.xml | 2 +-
man/locale.conf.xml | 2 +-
man/logind.conf.xml | 25 +++++++++++++------------
man/os-release.xml | 2 +-
man/pam_systemd.xml | 6 +++---
man/sd-daemon.xml | 2 +-
man/sd_booted.xml | 2 +-
man/sd_is_fifo.xml | 2 +-
man/sd_journal_print.xml | 2 +-
man/sd_listen_fds.xml | 2 +-
man/sd_notify.xml | 2 +-
man/sd_seat_get_active.xml | 2 +-
man/systemctl.xml | 6 +++---
man/systemd.device.xml | 2 +-
man/systemd.exec.xml | 6 +++---
man/systemd.service.xml | 12 ++++++------
man/systemd.socket.xml | 8 ++++----
man/systemd.unit.xml | 2 +-
src/core/dbus-unit.c | 2 +-
src/core/transaction.c | 2 +-
src/core/unit.c | 2 +-
src/core/unit.h | 2 +-
src/journal/journal-file.c | 2 +-
src/journal/lookup3.c | 2 +-
src/journal/mmap-cache.c | 2 +-
src/libudev/libudev-device.c | 2 +-
src/python-systemd/_journal.c | 5 +++++
src/systemd/sd-daemon.h | 2 +-
src/udev/udevd.c | 2 +-
test/test-functions | 2 +-
36 files changed, 79 insertions(+), 74 deletions(-)
New commits:
commit 0675cc4a02dfa3e7abc47d0c2117bf413b1d7698
Author: Eelco Dolstra <eelco.dolstra at logicblox.com>
Date: Thu Sep 13 13:44:47 2012 -0400
daemon: Fix broken links to sd-daemon.c
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index 30a1b92..1e1734a 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -138,7 +138,7 @@
<para>In addition, for details about the algorithms
check the liberally licensed reference implementation
sources:
- <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c"/>
+ <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c"/>
resp. <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
<para>These APIs are implemented in the reference
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index 83cbd6b..3567d58 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -93,7 +93,7 @@
<para>For details about the algorithm check the
liberally licensed reference implementation sources:
- <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c"/>
+ <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c"/>
resp. <ulink
url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index a41447b..a98122b 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -180,7 +180,7 @@
<para>For details about the algorithms check the
liberally licensed reference implementation sources:
- <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c"/>
+ <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c"/>
resp. <ulink
url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index f6a9497..649b199 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -141,7 +141,7 @@
<para>For details about the algorithm check the
liberally licensed reference implementation sources:
- <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c"/>
+ <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c"/>
resp. <ulink
url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 606ee1e..346ec8f 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -227,7 +227,7 @@
<para>For details about the algorithms check the
liberally licensed reference implementation sources:
- <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c"/>
+ <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c"/>
resp. <ulink
url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index b204e31..fb7456d 100644
--- a/src/systemd/sd-daemon.h
+++ b/src/systemd/sd-daemon.h
@@ -59,7 +59,7 @@ extern "C" {
You may find an up-to-date version of these source files online:
http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h
- http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c
+ http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c
This should compile on non-Linux systems, too, but with the
exception of the sd_is_xxx() calls all functions will become NOPs.
commit 64e441d0cfebd4c13df100c429b9adf5f1aea56b
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Sep 13 19:40:19 2012 +0200
man: reword logind.conf.xml a bit
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index beb5211..79a8932 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -70,12 +70,13 @@
<term><varname>NAutoVTs=</varname></term>
<listitem><para>Takes a positive
- integer. How many virtual terminals to
- allocate by default and when switched
- to autospawn <literal>autovt</literal>
- services on (if they are otherwise
- unused). These services are
- instantiated from a template of
+ integer. Configures how many virtual
+ terminals to allocate by default that
+ -- when switched to --
+ <literal>autovt</literal> services are
+ automatically spawned on. These
+ services are instantiated from the
+ template
<filename>autovt at .service</filename>
with the virtual terminal TTY name,
e.g. <filename>autovt at tty4.service</filename>. By
@@ -85,7 +86,7 @@
<filename>getty at .service</filename>,
i.e. login prompts are started
dynamically as the user switches to
- unused virtual terminals, and this
+ unused virtual terminals. This
parameter hence controls how many
gettys are available on the virtual
terminals. Defaults to 6. When set to
@@ -154,8 +155,8 @@
time a system shutdown or sleep
request is delayed due to an inhibitor
lock of type <literal>delay</literal>
- being taken before it is ignored and
- the operation executed
+ being active -- before it is ignored
+ and the operation executed
anyway. Defaults to
5s.</para></listitem>
</varlistentry>
commit 071d73c1aad44e5d8f9bfb11442d468e3131200a
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date: Tue Sep 11 22:53:48 2012 +0200
docs: typo fixes in pam_systemd.xml
https://bugs.freedesktop.org/show_bug.cgi?id=54501
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index 27edea7..2d2f191 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -99,7 +99,7 @@
control group are killed and the control group
is removed.</para></listitem>
- <listitem><para>If last subgroup of the
+ <listitem><para>If the last subgroup of the
<filename>/user/$USER</filename> control group
was removed the
<varname>$XDG_RUNTIME_DIR</varname> directory
commit 08307930b297fd1c6335afc746e4404dece6ef21
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date: Mon Sep 10 19:41:37 2012 +0200
docs: typo fixes in logind.conf.xml and os-release.xml
https://bugs.freedesktop.org/show_bug.cgi?id=54501
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 33ddf62..beb5211 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -54,7 +54,7 @@
<refsect1>
<title>Description</title>
- <para>This files configures various parameters of the systemd login manager <citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+ <para>This file configures various parameters of the systemd login manager <citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
</refsect1>
@@ -133,7 +133,7 @@
<listitem><para>These settings control
the default control group hierarchies
- users logging are added to. When
+ users logging in are added to. When
logging in users will get private
control groups in all hierarchies
listed in
@@ -180,7 +180,7 @@
<literal>no-session</literal> logind
will handle these keys when no user is
logged in and no inhibitor lock is
- taken, and trigger a warnig beep
+ taken, and trigger a warning beep
otherwise. If set to
<literal>tty-session</literal> logind
will handle these keys if no inhibitor
diff --git a/man/os-release.xml b/man/os-release.xml
index a5f1a91..5e34a88 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -258,7 +258,7 @@
<listitem><para>Links to resources on
the Internet related the operating
system. <varname>HOME_URL=</varname>
- should refer to the homepage of the of
+ should refer to the homepage of the
operating system, or alternatively
some homepage of the specific version
of the operating
commit a0b78ede25ad1b07521aa6c1b70258dcc05136fa
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date: Wed Sep 5 23:08:06 2012 +0200
man: fix typos in halt.xml and journalctl.xml
https://bugs.freedesktop.org/show_bug.cgi?id=54501
diff --git a/man/halt.xml b/man/halt.xml
index ed1c52c..8473965 100644
--- a/man/halt.xml
+++ b/man/halt.xml
@@ -88,7 +88,7 @@
<term><option>--halt</option></term>
<listitem><para>Halt the machine,
- regardless which one of the three
+ regardless of which one of the three
commands is invoked.</para></listitem>
</varlistentry>
@@ -97,7 +97,7 @@
<term><option>--poweroff</option></term>
<listitem><para>Power-off the machine,
- regardless which one of the three
+ regardless of which one of the three
commands is invoked.</para></listitem>
</varlistentry>
@@ -105,7 +105,7 @@
<term><option>--reboot</option></term>
<listitem><para>Reboot the machine,
- regardless which one of the three
+ regardless of which one of the three
commands is invoked.</para></listitem>
</varlistentry>
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 9800cf3..83ddf5c 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -62,7 +62,7 @@
journal as written by
<citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
- <para>If called without parameter will show the full
+ <para>If called without parameter it will show the full
contents of the journal, starting with the oldest
entry collected.</para>
@@ -149,7 +149,7 @@
<term><option>--follow</option></term>
<term><option>-f</option></term>
- <listitem><para>Show only most recent
+ <listitem><para>Show only the most recent
journal entries, and continuously print
new entries as they are appended to
the journal.</para></listitem>
@@ -257,7 +257,7 @@
<listitem><para>Takes an absolute
directory path as argument. If
- specified will operate on the
+ specified journalctl will operate on the
specified journal directory instead of
the default runtime and system journal
paths.</para></listitem>
@@ -287,7 +287,7 @@
<literal>info</literal> (6),
<literal>debug</literal> (7). If a
single log level is specified all
- messages with this log levels or a
+ messages with this log level or a
lower (hence more important) log level
are shown. If a range is specified all
messages within the range are shown,
@@ -316,7 +316,7 @@
<listitem><para>Instead of showing
journal contents show internal header
- information of the journal fiels
+ information of the journal fields
accessed.</para></listitem>
</varlistentry>
@@ -425,7 +425,7 @@
<programlisting>journalctl _SYSTEMD_UNIT=avahi-daemon.service _SYSTEMD_UNIT=dbus.service</programlisting>
<para>If the separator "<literal>+</literal>" is used
- two expression may be combined in a logical OR. The
+ two expressions may be combined in a logical OR. The
following will show all messages from the Avahi
service process with the PID 28097 plus all messages
from the D-Bus service (from any of its
commit c53158818d8cdaf46b3f1b5299b9bda118a1043f
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date: Tue Sep 4 19:24:16 2012 +0200
man: fix a bunch of typos in docs
https://bugs.freedesktop.org/show_bug.cgi?id=54501
diff --git a/man/bootup.xml b/man/bootup.xml
index ae70c95..4cc4baf 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -111,7 +111,7 @@
target units are available, as listed on
<citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
- <para>The follow chart is a structural overview of
+ <para>The following chart is a structural overview of
these well-known units and their position in the
boot-up logic. The arrows describe which units are
pulled in and ordered before which other units. Units
diff --git a/man/crypttab.xml b/man/crypttab.xml
index 8711272..2a83994 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -175,7 +175,7 @@
<varlistentry>
<term><varname>verify</varname></term>
- <listitem><para> If the the encryption
+ <listitem><para> If the encryption
password is read from console, it has
to be entered twice (to prevent
typos). </para></listitem>
@@ -217,9 +217,9 @@
<term><varname>timeout=</varname></term>
<listitem><para>Specify the timeout
- for querying for a password. If not
- unit is specified in
- seconds. Supported units are s, ms,
+ for querying for a password. If no
+ unit is specified seconds is used.
+ Supported units are s, ms,
us, min, h, d.</para></listitem>
</varlistentry>
diff --git a/man/daemon.xml b/man/daemon.xml
index 9d43353..e3c038e 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -181,11 +181,11 @@
<function>exit()</function> in the
original process. The process that
invoked the daemon must be able to
- rely that this
+ rely on that this
<function>exit()</function> happens
after initialization is complete and
all external communication channels
- established and
+ are established and
accessible.</para></listitem>
</orderedlist>
@@ -196,7 +196,7 @@
compatibility with SysV systems should
implement the scheme pointed out
above. However, it is recommended to make this
- behaviour optional and configurable via a
+ behavior optional and configurable via a
command line argument, to ease debugging as
well as to simplify integration into systems
using systemd.</para>
@@ -271,7 +271,7 @@
for details.</para></listitem>
<listitem><para>As much as possible,
- rely on the init systemd's
+ rely on the init system's
functionality to limit the access of
the daemon to files, services and
other resources. i.e. in the case of
@@ -462,7 +462,7 @@
<para>New-style daemons which support socket
activation must be able to receive their
- sockets from the init system, instead of of
+ sockets from the init system, instead of
creating and binding them themselves. For
details about the programming interfaces for
this scheme provided by systemd see
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index cfc9b85..27f0d40 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -93,7 +93,7 @@
<listitem>
<para>Parameters understood by
the system and service manager
- to control system behaviour. For details see
+ to control system behavior. For details see
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
</listitem>
</varlistentry>
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index 2cbcdc6..06c0af0 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -117,7 +117,7 @@
<varname>LC_TELEPHONE=</varname>,
<varname>LC_MEASUREMENT=</varname>,
<varname>LC_IDENTIFICATION=</varname>. Note that
- <varname>LC_ALL</varname> may not be be configured in
+ <varname>LC_ALL</varname> may not be configured in
this file. For details about the meaning and semantics
of these settings, refer to
<citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index f2c1ab8..27edea7 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -157,7 +157,7 @@
listed in this argument will not be
subject to the effect of
<option>kill-session-processes=</option>. Note
- that that this option takes precedence
+ that this option takes precedence
over
<option>kill-only-users=</option>, and
hence whatever is listed for
@@ -272,7 +272,7 @@
in again, the directory contents will
have been lost in between, but
applications should not rely on this
- behaviour and must be able to deal with
+ behavior and must be able to deal with
stale files. To store session-private
data in this directory the user should
include the value of <varname>$XDG_SESSION_ID</varname>
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index c03762a..41414bb 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -123,7 +123,7 @@
object of type <literal>va_list</literal> (see
<citerefentry><refentrytitle>stdarg</refentrytitle><manvolnum>3</manvolnum></citerefentry>
for more information) instead of the format string. It
- is otherwise equivalent in behaviour.</para>
+ is otherwise equivalent in behavior.</para>
<para><function>sd_journal_send()</function> may be
used to submit structured log entries to the system
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index 801c16a..778f9ae 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -93,7 +93,7 @@
a seat, if there is any. Returns the session
identifier and the user identifier of the Unix user
the session is belonging to. Either the session or the
- user identifier parameter can be be passed NULL, in
+ user identifier parameter can be passed NULL, in
case only one of the parameters shall be queried. The
returned string needs to be freed with the libc
<citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index c5fae82..fedc588 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1107,7 +1107,7 @@
mounted read-only, immediately
followed by the system halt. If
<option>--force</option> is specified
- twice the the operation is immediately
+ twice the operation is immediately
executed without terminating any
processes or unmounting any file
systems. This may result in data
@@ -1128,7 +1128,7 @@
unmounted or mounted read-only,
immediately followed by the powering
off. If <option>--force</option> is
- specified twice the the operation is
+ specified twice the operation is
immediately executed without
terminating any processes or
unmounting any file systems. This may
@@ -1149,7 +1149,7 @@
unmounted or mounted read-only,
immediately followed by the reboot. If
<option>--force</option> is specified
- twice the the operation is immediately
+ twice the operation is immediately
executed without terminating any
processes or unmounting any file
systems. This may result in data
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index 7c05ab0..c360319 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -131,7 +131,7 @@
to 1 the device will be considered
plugged the moment it shows up in the
udev tree. This property has no
- influence on the behaviour when a
+ influence on the behavior when a
device disappears from the udev
tree. This option is useful to support
devices that initially show up in an
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index cf6ab17..7ab9b5c 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -471,7 +471,7 @@
</varlistentry>
<varlistentry>
<term><varname>TTYVTDisallocate=</varname></term>
- <listitem><para>If the the terminal
+ <listitem><para>If the terminal
device specified with
<varname>TTYPath=</varname> is a
virtual console terminal try to
@@ -806,7 +806,7 @@
<listitem><para>Set a specific control
group attribute for executed
- processes, and (if needed) add the the
+ processes, and (if needed) add the
executed processes to a cgroup in the
hierarchy of the controller the
attribute belongs to. Takes two
@@ -1055,7 +1055,7 @@
<varlistentry>
<term><varname>UtmpIdentifier=</varname></term>
- <listitem><para>Takes a a four
+ <listitem><para>Takes a four
character identifier string for an
utmp/wtmp entry for this service. This
should only be set for services such
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index c547948..339dea9 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -160,7 +160,7 @@
complete and all communication
channels set up. The child continues
to run as the main daemon
- process. This is the behaviour of
+ process. This is the behavior of
traditional UNIX daemons. If this
setting is used, it is recommended to
also use the
@@ -171,7 +171,7 @@
soon as the parent process
exits.</para>
- <para>Behaviour of
+ <para>Behavior of
<option>oneshot</option> is similar
to <option>simple</option>, however
it is expected that the process has to
@@ -180,7 +180,7 @@
is particularly useful for this type
of service.</para>
- <para>Behaviour of
+ <para>Behavior of
<option>dbus</option> is similar to
<option>simple</option>, however it is
expected that the daemon acquires a
@@ -197,7 +197,7 @@
<varname>BusName=</varname> is
specified.</para>
- <para>Behaviour of
+ <para>Behavior of
<option>notify</option> is similar to
<option>simple</option>, however it is
expected that the daemon sends a
@@ -216,7 +216,7 @@
not set, it will be implicitly set to
<option>main</option>.</para>
- <para>Behaviour of
+ <para>Behavior of
<option>idle</option> is very similar
to <option>simple</option>, however
actual execution of a the service
@@ -599,7 +599,7 @@
SIGTERM and SIGPIPE. Exit status
definitions can either be numeric exit
codes or termination signal names, and
- are are separated by spaces. Example:
+ are separated by spaces. Example:
"<literal>SuccessExitStatus=1 2 8
SIGKILL</literal>", ensures that exit
codes 1, 2, 8 and the termination
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 8a12e25..6cf6c79 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -217,7 +217,7 @@
<listitem><para>Specifies a file
system FIFO to listen on. This expects
an absolute file system path as
- argument. Behaviour otherwise is very
+ argument. Behavior otherwise is very
similar to the
<varname>ListenDatagram=</varname>
directive above.</para></listitem>
@@ -228,7 +228,7 @@
<listitem><para>Specifies a special
file in the file system to listen
on. This expects an absolute file
- system path as argument. Behaviour
+ system path as argument. Behavior
otherwise is very similar to the
<varname>ListenFIFO=</varname>
directive above. Use this to open
@@ -248,7 +248,7 @@
or <varname>kobject-uevent</varname>)
as argument, optionally suffixed by a
whitespace followed by a multicast
- group integer. Behaviour otherwise is
+ group integer. Behavior otherwise is
very similar to the
<varname>ListenDatagram=</varname>
directive above.</para></listitem>
@@ -259,7 +259,7 @@
<listitem><para>Specifies a POSIX
message queue name to listen on. This
expects a valid message queue name
- (i.e. beginning with /). Behaviour
+ (i.e. beginning with /). Behavior
otherwise is very similar to the
<varname>ListenFIFO=</varname>
directive above. On Linux message
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 00f6066..e0aadf4 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -440,7 +440,7 @@
<listitem><para>Configures requirement
dependencies, very similar in style to
<varname>Requires=</varname>, however
- in addition to this behaviour it also
+ in addition to this behavior it also
declares that this unit is stopped
when any of the units listed suddenly
disappears. Units can suddenly,
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index ad817d7..fdfa5ee 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -682,7 +682,7 @@ void bus_unit_send_change_signal(Unit *u) {
/* Send a properties changed signal. First for the
* specific type, then for the generic unit. The
* clients may rely on this order to get atomic
- * behaviour if needed. */
+ * behavior if needed. */
if (UNIT_VTABLE(u)->bus_invalidating_properties) {
diff --git a/src/core/transaction.c b/src/core/transaction.c
index 1f8d803..4bce942 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -392,7 +392,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
j->marker = from ? from : j;
j->generation = generation;
- /* We assume that the the dependencies are bidirectional, and
+ /* We assume that the dependencies are bidirectional, and
* hence can ignore UNIT_AFTER */
SET_FOREACH(u, j->unit->dependencies[UNIT_BEFORE], i) {
Job *o;
diff --git a/src/core/unit.c b/src/core/unit.c
index c9cd9ee..3950c43 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1327,7 +1327,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
/* Note that this is called for all low-level state changes,
* even if they might map to the same high-level
* UnitActiveState! That means that ns == os is OK an expected
- * behaviour here. For example: if a mount point is remounted
+ * behavior here. For example: if a mount point is remounted
* this function will be called too! */
if (u->manager->n_reloading <= 0) {
diff --git a/src/core/unit.h b/src/core/unit.h
index 89bd61c..5b4dda4 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -285,7 +285,7 @@ struct UnitVTable {
* UNIT_STUB if no configuration could be found. */
int (*load)(Unit *u);
- /* If a a lot of units got created via enumerate(), this is
+ /* If a lot of units got created via enumerate(), this is
* where to actually set the state and call unit_notify(). */
int (*coldplug)(Unit *u);
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 8dc0a3a..e778e1c 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1051,7 +1051,7 @@ void journal_file_post_change(JournalFile *f) {
__sync_synchronize();
if (ftruncate(f->fd, f->last_stat.st_size) < 0)
- log_error("Failed to to truncate file to its own size: %m");
+ log_error("Failed to truncate file to its own size: %m");
}
int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, uint64_t *seqnum, Object **ret, uint64_t *offset) {
diff --git a/src/journal/lookup3.c b/src/journal/lookup3.c
index 31eac8c..ee9a183 100644
--- a/src/journal/lookup3.c
+++ b/src/journal/lookup3.c
@@ -14,7 +14,7 @@ if SELF_TEST is defined. You can use this free for any purpose. It's in
the public domain. It has no warranty.
You probably want to use hashlittle(). hashlittle() and hashbig()
-hash byte arrays. hashlittle() is is faster than hashbig() on
+hash byte arrays. hashlittle() is faster than hashbig() on
little-endian machines. Intel and AMD are little-endian machines.
On second thought, you probably want hashlittle2(), which is identical to
hashlittle() except it returns two 32-bit hashes for the price of one.
diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
index 2b45e37..7d6c6c2 100644
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -392,7 +392,7 @@ static int mmap_cache_put(
if (st) {
/* Memory maps that are larger then the files
- underneath have undefined behaviour. Hence, clamp
+ underneath have undefined behavior. Hence, clamp
things to the file size if we know it */
if (woffset >= (uint64_t) st->st_size)
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index 1bef709..972ace5 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -1124,7 +1124,7 @@ _public_ const char *udev_device_get_sysname(struct udev_device *udev_device)
*
* Get the instance number of the device.
*
- * Returns: the trailing number string of of the device name
+ * Returns: the trailing number string of the device name
**/
_public_ const char *udev_device_get_sysnum(struct udev_device *udev_device)
{
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index b4fc624..35263ff 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1177,7 +1177,7 @@ int main(int argc, char *argv[])
}
if (systemd_fds(udev, &fd_ctrl, &fd_netlink) >= 0) {
- /* get control and netlink socket from from systemd */
+ /* get control and netlink socket from systemd */
udev_ctrl = udev_ctrl_new_from_fd(udev, fd_ctrl);
if (udev_ctrl == NULL) {
log_error("error taking over udev control socket");
diff --git a/test/test-functions b/test/test-functions
index c355423..0587cd4 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -620,7 +620,7 @@ for_each_kmod_dep() {
# $1 = search only in subdirectory of /kernel/$1
# $2 = function to call with module name to filter.
# This function will be passed the full path to the module to test.
-# The behaviour of this function can vary depending on whether $hostonly is set.
+# The behavior of this function can vary depending on whether $hostonly is set.
# If it is, we will only look at modules that are already in memory.
# If it is not, we will look at all kernel modules
# This function returns the full filenames of modules that match $1
commit ff89a42a8602443b9a74be276cf3ee351b3914c7
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Sep 13 19:34:09 2012 +0200
python: make gcc shut up
diff --git a/Makefile.am b/Makefile.am
index 8885ab8..be97193 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3419,7 +3419,6 @@ _journal_la_SOURCES = \
_journal_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
- -Wno-missing-prototypes \
$(PYTHON_CFLAGS)
_journal_la_LDFLAGS = \
diff --git a/src/python-systemd/_journal.c b/src/python-systemd/_journal.c
index eab9c29..d27178d 100644
--- a/src/python-systemd/_journal.c
+++ b/src/python-systemd/_journal.c
@@ -113,6 +113,9 @@ static PyMethodDef methods[] = {
{ NULL, NULL, 0, NULL } /* Sentinel */
};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+
#if PY_MAJOR_VERSION < 3
PyMODINIT_FUNC init_journal(void) {
@@ -133,4 +136,6 @@ PyMODINIT_FUNC PyInit__journal(void) {
return PyModule_Create(&module);
}
+#pragma GCC diagnostic pop
+
#endif
More information about the systemd-commits
mailing list