Merge pull request systemd#21990 from keszybz/indentation-and-comments

bluca · web-flow · commit c9b1efdf146b · 2022-01-04T00:18:10.000Z
Indentation and comments
diff --git a/.clang-format b/.clang-format
@@ -1,7 +1,7 @@
 # This configuration file can be used to auto-format the code base.
 # Not all guidelines specified in CODING_STYLE are followed, so the
 # result MUST NOT be committed indiscriminately, but each automated
-# change should be reviewed and only the appropriate ones commited.
+# change should be reviewed and only the appropriate ones committed.
 #
 # The easiest way to apply the formatting to your changes ONLY,
 # is to use the git-clang-format script (usually installed with clang-format).
diff --git a/.github/workflows/run_mkosi.sh b/.github/workflows/run_mkosi.sh
@@ -13,7 +13,7 @@ for ((i = 0; i < 5; i++)); do
     EC=0
     (sudo python3 -m mkosi "$@") |& tee "$TEMPFILE" || EC=$?
     if [[ $EC -eq 0 ]]; then
-        # The command passed - let's return immediatelly
+        # The command passed — let's return immediately
         break
     fi
 
@@ -23,7 +23,7 @@ for ((i = 0; i < 5; i++)); do
         exit $EC
     fi
 
-    # The command failed due to the dissect-related timeout - let's try again
+    # The command failed due to the dissect-related timeout — let's try again
     sleep 1
 done
 
diff --git a/docs/CODE_QUALITY.md b/docs/CODE_QUALITY.md
@@ -51,8 +51,8 @@ available functionality:
 
 9. There are multiple CI systems in use that run on every github PR submission.
 
-10. [Coverity](https://scan.coverity.com/) is analyzing systemd master in
-    regular intervals. The reports are available
+10. [Coverity](https://scan.coverity.com/) is analyzing systemd `main` branch
+    in regular intervals. The reports are available
     [online](https://scan.coverity.com/projects/systemd).
 
 11. [oss-fuzz](https://oss-fuzz.com/) is continuously fuzzing the
@@ -65,7 +65,7 @@ available functionality:
 13. When building systemd from a git checkout the build scripts will
     automatically enable a git commit hook that ensures whitespace cleanliness.
 
-14. [LGTM](https://lgtm.com/) analyzes every commit pushed to master. The list
+14. [LGTM](https://lgtm.com/) analyzes every commit pushed to `main`. The list
     of active alerts can be found
     [here](https://lgtm.com/projects/g/systemd/systemd/alerts/?mode=list).
 
@@ -75,7 +75,7 @@ available functionality:
     for more information.
 
 16. Fossies provides [source code misspelling reports](https://fossies.org/features.html#codespell).
-    The systemd report can be found [here](https://fossies.org/linux/test/systemd-master.tar.gz/codespell.html).
+    The systemd report can be found [here](https://fossies.org/linux/misc/systemd/codespell.html).
 
 Access to Coverity and oss-fuzz reports is limited. Please reach out to the
 maintainers if you need access.
diff --git a/docs/CONTAINER_INTERFACE.md b/docs/CONTAINER_INTERFACE.md
@@ -37,18 +37,18 @@ manager, please consider supporting the following interfaces.
    in this context.)
 
 3. Pre-mount `/dev/` as (container private) `tmpfs` for the container and bind
-   mount some suitable TTY to `/dev/console`. If this is a pty, make sure to not
-   close the controlling pty master during systemd's lifetime. PID1 will close
+   mount some suitable TTY to `/dev/console`. If this is a pty, make sure to
+   not close the controlling pty during systemd's lifetime. PID1 will close
    ttys, to avoid being killed by SAK. It only opens ttys for the time it
-   actually needs to print something. Also, make sure to create device
-   nodes for `/dev/null`, `/dev/zero`, `/dev/full`, `/dev/random`,
-   `/dev/urandom`, `/dev/tty`, `/dev/ptmx` in `/dev/`. It is not necessary to
-   create `/dev/fd` or `/dev/stdout`, as systemd will do that on its own. Make
-   sure to set up a `BPF_PROG_TYPE_CGROUP_DEVICE` BPF program — on cgroupv2 —
-   or the `devices` cgroup controller — on cgroupv1 — so that no other devices
-   but these may be created in the container. Note that many systemd services
-   use `PrivateDevices=`, which means that systemd will set up a private
-   `/dev/` for them for which it needs to be able to create these device nodes.
+   actually needs to print something. Also, make sure to create device nodes
+   for `/dev/null`, `/dev/zero`, `/dev/full`, `/dev/random`, `/dev/urandom`,
+   `/dev/tty`, `/dev/ptmx` in `/dev/`. It is not necessary to create `/dev/fd`
+   or `/dev/stdout`, as systemd will do that on its own. Make sure to set up a
+   `BPF_PROG_TYPE_CGROUP_DEVICE` BPF program — on cgroupv2 — or the `devices`
+   cgroup controller — on cgroupv1 — so that no other devices but these may be
+   created in the container. Note that many systemd services use
+   `PrivateDevices=`, which means that systemd will set up a private `/dev/`
+   for them for which it needs to be able to create these device nodes.
    Dropping `CAP_MKNOD` for containers is hence generally not advisable, but
    see below.
 
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -31,7 +31,7 @@ See [reporting of security vulnerabilities](SECURITY.md).
 
 ## Posting Pull Requests
 
-* Make sure to post PRs only relative to a very recent git master.
+* Make sure to post PRs only relative to a very recent git tip.
 * Follow our [Coding Style](CODING_STYLE.md) when contributing code. This is a requirement for all code we merge.
 * Please make sure to test your change before submitting the PR. See the [Hacking guide](HACKING.md) for details on how to do this.
 * Make sure to run the test suite locally, before posting your PR. We use a CI system, meaning we don't even look at your PR, if the build and tests don't pass.
diff --git a/docs/JOURNAL_NATIVE_PROTOCOL.md b/docs/JOURNAL_NATIVE_PROTOCOL.md
@@ -185,7 +185,7 @@ took place for the current program.
 
 If you are looking for alternative implementations of this protocol (besides
 systemd's own in `sd_journal_print()`), consider
-[GLib's](https://gitlab.gnome.org/GNOME/glib/-/blob/master/glib/gmessages.c) or
+[GLib's](https://gitlab.gnome.org/GNOME/glib/-/blob/main/glib/gmessages.c) or
 [`dbus-broker`'s](https://github.com/bus1/dbus-broker/blob/main/src/util/log.c).
 
 And that's already all there is to it.
diff --git a/docs/RELEASE.md b/docs/RELEASE.md
@@ -21,4 +21,4 @@ SPDX-License-Identifier: LGPL-2.1-or-later
 12. "Draft" a new release on github (https://github.com/systemd/systemd/releases/new), mark "This is a pre-release" if appropriate.
 13. Check that announcement to systemd-devel, with a copy&paste from NEWS, was sent. This should happen automatically.
 14. Update IRC topic (`/msg chanserv TOPIC #systemd Version NNN released`)
-15. [FINAL] Push commits to stable, create an empty -stable branch: `git push systemd-stable origin/master:master origin/master:refs/heads/${version}-stable`, and change the default branch to latest release (https://github.com/systemd/systemd-stable/settings/branches).
+15. [FINAL] Push commits to stable, create an empty -stable branch: `git push systemd-stable --atomic origin/main:main origin/main:refs/heads/${version}-stable`, and change the default branch to latest release (https://github.com/systemd/systemd-stable/settings/branches).
diff --git a/docs/UIDS-GIDS.md b/docs/UIDS-GIDS.md
@@ -81,7 +81,7 @@ available during earliest boot, including in the initial RAM disk).
 above). However, it does define some special group/GID assignments, which are
 primarily used for `systemd-udevd`'s device management. The precise list of the
 currently defined groups is found in this `sysusers.d` snippet:
-[basic.conf](https://raw.githubusercontent.com/systemd/systemd/master/sysusers.d/basic.conf.in)
+[basic.conf](https://raw.githubusercontent.com/systemd/systemd/main/sysusers.d/basic.conf.in)
 
 It's strongly recommended that downstream distributions include these groups in
 their default group databases.
diff --git a/po/be.po b/po/be.po
@@ -7,7 +7,6 @@
 # Zmicer Turok <nashtlumach@gmail.com>, 2020, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-01-10 18:36+0000\n"
diff --git a/po/be@latin.po b/po/be@latin.po
@@ -6,7 +6,6 @@
 # Viktar Vaŭčkievič <victorenator@gmail.com>, 2015, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2016-06-09 19:50+0300\n"
diff --git a/po/bg.po b/po/bg.po
@@ -6,7 +6,6 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2016-05-14 13:28+0300\n"
diff --git a/po/ca.po b/po/ca.po
@@ -5,7 +5,6 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2018. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2018-02-27 04:18-0500\n"
diff --git a/po/cs.po b/po/cs.po
@@ -4,7 +4,6 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2020-10-26 22:48+0100\n"
diff --git a/po/da.po b/po/da.po
@@ -5,7 +5,6 @@
 # scootergrisen <scootergrisen@gmail.com>, 2020, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-06-02 16:03+0000\n"
diff --git a/po/de.po b/po/de.po
@@ -9,7 +9,6 @@
 # Christian Wehrli <christian@chw.onl>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-11-08 00:49+0000\n"
diff --git a/po/el.po b/po/el.po
@@ -5,7 +5,6 @@
 # Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2014-04-29 09:17+0300\n"
diff --git a/po/es.po b/po/es.po
@@ -8,7 +8,6 @@
 # Emilio Herrera <ehespinosa57@gmail.com>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-08-26 18:05+0000\n"
diff --git a/po/fi.po b/po/fi.po
@@ -4,7 +4,6 @@
 # Jan Kuparinen <copper_fin@hotmail.com>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-09-14 19:04+0000\n"
diff --git a/po/fr.po b/po/fr.po
@@ -7,7 +7,6 @@
 # Arnaud T. <listes.00@gmail.com>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-01-14 06:37+0000\n"
diff --git a/po/gl.po b/po/gl.po
@@ -3,7 +3,6 @@
 # Fran Dieguez <frandieguez@gnome.org>, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2019-12-29 22:30+0100\n"
diff --git a/po/hr.po b/po/hr.po
@@ -6,7 +6,6 @@
 # Gogo Gogsi <linux.hr@protonmail.com>, 2020, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-10-03 16:04+0000\n"
diff --git a/po/hu.po b/po/hu.po
@@ -7,7 +7,6 @@
 # Balázs Úr <urbalazs at gmail dot com>, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2016-08-23 18:03+0100\n"
diff --git a/po/id.po b/po/id.po
@@ -4,7 +4,6 @@
 # Andika Triwidada <andika@gmail.com>, 2014, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-09-24 11:05+0000\n"
diff --git a/po/it.po b/po/it.po
@@ -5,7 +5,6 @@
 # Daniele Medri <dmedri@gmail.com>, 2013-2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-01-08 17:51+0100\n"
diff --git a/po/ja.po b/po/ja.po
@@ -5,7 +5,6 @@
 # Takuro Onoue <kusanaginoturugi@gmail.com>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-09-09 03:04+0000\n"
diff --git a/po/kab.po b/po/kab.po
@@ -4,7 +4,6 @@
 # Slimane Selyan Amiri <selyan.kab@gmail.com>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-10-03 16:04+0000\n"
diff --git a/po/ko.po b/po/ko.po
@@ -6,7 +6,6 @@
 # simmon <simmon@nplob.com>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-06-22 10:04+0000\n"
diff --git a/po/lt.po b/po/lt.po
@@ -3,7 +3,6 @@
 # Moo, 2018. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2019-04-08 22:01+0300\n"
diff --git a/po/nl.po b/po/nl.po
@@ -4,7 +4,6 @@
 # Pjotr Vertaalt <pjotrvertaalt@gmail.com>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-03-24 09:16+0000\n"
diff --git a/po/pa.po b/po/pa.po
@@ -3,7 +3,6 @@
 # A S Alam <amanpreet.alam@gmail.com>, 2020, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-01-24 16:38+0000\n"
diff --git a/po/pl.po b/po/pl.po
@@ -4,7 +4,6 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2020-10-18 13:10+0200\n"
diff --git a/po/pt.po b/po/pt.po
@@ -4,7 +4,6 @@
 # Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-09-16 18:04+0000\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
@@ -7,7 +7,6 @@
 # Gustavo Costa <xfgusta@gmail.com>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-08-17 07:04+0000\n"
diff --git a/po/ro.po b/po/ro.po
@@ -6,7 +6,6 @@
 # Vlad <milovlad@outlook.com>, 2020, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-01-12 17:36+0000\n"
diff --git a/po/ru.po b/po/ru.po
@@ -8,7 +8,6 @@
 # Alexey Rubtsov <rushills@gmail.com>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-07-02 09:04+0000\n"
diff --git a/po/si.po b/po/si.po
@@ -4,7 +4,6 @@
 # Hela Basa <r45xveza@pm.me>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-08-19 07:04+0000\n"
diff --git a/po/sk.po b/po/sk.po
@@ -5,7 +5,6 @@
 # Frantisek Sumsal <frantisek@sumsal.cz>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-02-22 20:21+0000\n"
diff --git a/po/sr.po b/po/sr.po
@@ -4,7 +4,6 @@
 # Frantisek Sumsal <frantisek@sumsal.cz>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-02-23 22:40+0000\n"
diff --git a/po/sv.po b/po/sv.po
@@ -8,7 +8,6 @@
 # Luna Jernberg <bittin@reimu.nl>, 2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-02-10 15:40+0000\n"
diff --git a/po/systemd.pot b/po/systemd.pot
@@ -3,7 +3,6 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
diff --git a/po/tr.po b/po/tr.po
@@ -7,7 +7,6 @@
 # Muhammet Kara <muhammetk@gmail.com>, 2015-2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2020-11-28 13:35+0000\n"
diff --git a/po/uk.po b/po/uk.po
@@ -6,7 +6,6 @@
 # Yuri Chornoivan <yurchor@ukr.net>, 2019, 2020, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-01-09 10:51+0000\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
@@ -8,7 +8,6 @@
 # Whired Planck <fungdaat31@outlook.com>, 2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
 "PO-Revision-Date: 2021-03-01 09:40+0000\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
diff --git a/src/core/bpf-lsm.c b/src/core/bpf-lsm.c
diff --git a/src/test/test-bpf-lsm.c b/src/test/test-bpf-lsm.c
diff --git a/src/test/test-job-type.c b/src/test/test-job-type.c

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# This configuration file can be used to auto-format the code base.`
`2`	`2`	`# Not all guidelines specified in CODING_STYLE are followed, so the`
`3`	`3`	`# result MUST NOT be committed indiscriminately, but each automated`
`4`		`-# change should be reviewed and only the appropriate ones commited.`
	`4`	`+# change should be reviewed and only the appropriate ones committed.`
`5`	`5`	`#`
`6`	`6`	`# The easiest way to apply the formatting to your changes ONLY,`
`7`	`7`	`# is to use the git-clang-format script (usually installed with clang-format).`