tree-wide: use normal spelling of "reopen"

It's a commonly used verb meaning "to open again".

diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 3e93d3a678128213406cfd64a9149000adc02b54..e891920c630e57b90d13741fe9405c811d832149 100644 (file)
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -352,10 +352,10 @@
 
         <para>When this option is used the original file descriptors <command>systemd-run</command> receives are passed
         to the service processes as-is. If the service runs with different privileges than
-        <command>systemd-run</command>, this means the service might not be able to re-open the passed file
+        <command>systemd-run</command>, this means the service might not be able to reopen the passed file
         descriptors, due to normal file descriptor access restrictions. If the invoked process is a shell script that
         uses the <command>echo "hello" >/dev/stderr</command> construct for writing messages to stderr, this might
-        cause problems, as this only works if stderr can be re-opened. To mitigate this use the construct <command>echo
+        cause problems, as this only works if stderr can be reopened. To mitigate this use the construct <command>echo
         "hello" >&amp;2</command> instead, which is mostly equivalent and avoids this pitfall.</para>
 
         <xi:include href="version-info.xml" xpointer="v235"/></listitem>

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index ca20e6e308130b007288d77e84e88b7ed33c12ec..300255e03885c4acaecb9041443edcf4200be07b 100644 (file)
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -3017,7 +3017,7 @@ SystemCallErrorNumber=EPERM</programlisting>
         the kernel log buffer, the unit will implicitly gain a dependency of type <varname>After=</varname>
         on <filename>systemd-journald.socket</filename> (also see the "Implicit Dependencies" section
         above). Also note that in this case stdout (or stderr, see below) will be an
-        <constant>AF_UNIX</constant> stream socket, and not a pipe or FIFO that can be re-opened. This means
+        <constant>AF_UNIX</constant> stream socket, and not a pipe or FIFO that can be reopened. This means
         when executing shell scripts the construct <command>echo "hello" &gt; /dev/stderr</command> for
         writing text to stderr will not work. To mitigate this use the construct <command>echo "hello"
         >&amp;2</command> instead, which is mostly equivalent and avoids this pitfall.</para>

diff --git a/src/boot/efi/util.c b/src/boot/efi/util.c
index 25f5e0f032469cd873448868d7827e76fc5ddc7e..9cedc15d6a780a75b42c174c54251437c106f896 100644 (file)
--- a/src/boot/efi/util.c
+++ b/src/boot/efi/util.c
@@ -303,7 +303,7 @@ EFI_STATUS chunked_read(EFI_FILE *file, size_t *size, void *buf) {
          * Some broken firmwares cannot handle large file reads and will instead return
          * an error. As a workaround, read such files in small chunks.
          * Note that we cannot just try reading the whole file first on such firmware as
-         * that will permanently break the handle even if it is re-opened.
+         * that will permanently break the handle even if it is reopened.
          *
          * https://github.com/systemd/systemd/issues/25911 */
 

diff --git a/src/libsystemd/sd-journal/test-journal-interleaving.c b/src/libsystemd/sd-journal/test-journal-interleaving.c
index 8aeef8f6074f6c7a9abe0bafc7dec34252f28908..eac1af2f7b4f0f7c98e6c5d7051f099c97775909 100644 (file)
--- a/src/libsystemd/sd-journal/test-journal-interleaving.c
+++ b/src/libsystemd/sd-journal/test-journal-interleaving.c
@@ -502,7 +502,7 @@ static void test_sequence_numbers_one(void) {
         test_close(one);
 
         /* If the machine-id is not initialized, the header file verification
-         * (which happens when re-opening a journal file) will fail. */
+         * (which happens when reopening a journal file) will fail. */
         if (sd_id128_get_machine(NULL) >= 0) {
                 /* restart server */
                 seqnum = 0;

diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 1566dab0b6c5e84e184c2394625c1e2175e5b48f..7591bce08c3aef98ff6f4db118af5ee4f4893a49 100644 (file)
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -270,7 +270,7 @@ int inhibitor_load(Inhibitor *i) {
         if (i->fifo_path) {
                 _cleanup_close_ int fd = -EBADF;
 
-                /* Let's re-open the FIFO on both sides, and close the writing side right away */
+                /* Let's reopen the FIFO on both sides, and close the writing side right away */
                 fd = inhibitor_create_fifo(i);
                 if (fd < 0)
                         return log_error_errno(fd, "Failed to reopen FIFO: %m");

diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index c05ce7948926e9748bdcebfb3e60911587db1faa..9eb8834be68ad582ee70e414c0fcdf6535c41e54 100644 (file)
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -695,7 +695,7 @@ int pty_forward_new(
         else {
                 /* If we shall be invoked in interactive mode, let's switch on non-blocking mode, so that we
                  * never end up staving one direction while we block on the other. However, let's be careful
-                 * here and not turn on O_NONBLOCK for stdin/stdout directly, but of re-opened copies of
+                 * here and not turn on O_NONBLOCK for stdin/stdout directly, but of reopened copies of
                  * them. This has two advantages: when we are killed abruptly the stdin/stdout fds won't be
                  * left in O_NONBLOCK state for the next process using them. In addition, if some process
                  * running in the background wants to continue writing to our stdout it can do so without

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index ffd654e3727f2094ae1d9879a3a8c30c3e56e490..ff746056af76cdb4ae0669a5499527beee1d9643 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1580,7 +1580,7 @@ static int fd_set_attribute(
 
         procfs_fd = fd_reopen(fd, O_RDONLY|O_CLOEXEC|O_NOATIME);
         if (procfs_fd < 0)
-                return log_error_errno(procfs_fd, "Failed to re-open '%s': %m", path);
+                return log_error_errno(procfs_fd, "Failed to reopen '%s': %m", path);
 
         unsigned previous, current;
         r = chattr_full(procfs_fd, NULL, f, item->attribute_mask, &previous, &current, CHATTR_FALLBACK_BITWISE);
@@ -1732,7 +1732,7 @@ static int create_file(
                  * fd_set_perms() report the error if the perms need to be modified. */
                 fd = openat(dir_fd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH, i->mode);
                 if (fd < 0)
-                        return log_error_errno(errno, "Failed to re-open file %s: %m", path);
+                        return log_error_errno(errno, "Failed to reopen file %s: %m", path);
 
                 if (fstat(fd, &stbuf) < 0)
                         return log_error_errno(errno, "stat(%s) failed: %m", path);
@@ -1815,7 +1815,7 @@ static int truncate_file(
                                                        "Cannot create file %s on a read-only file system.",
                                                        path);
 
-                        return log_error_errno(errno, "Failed to re-open file %s: %m", path);
+                        return log_error_errno(errno, "Failed to reopen file %s: %m", path);
                 }
 
                 erofs = true;