Rename formats-util.h to format-util.h

We don't have plural in the name of any other -util files and this
inconsistency trips me up every time I try to type this file name
from memory. "formats-util" is even hard to pronounce.

diff --git a/Makefile.am b/Makefile.am
index f2d8bf57f70180188df42e27b825feb4510daa1d..37efdd86256b1d059988ca25fbf72b94d6a15346 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -932,7 +932,7 @@ libbasic_la_SOURCES = \
        src/basic/copy.h \
        src/basic/alloc-util.h \
        src/basic/alloc-util.c \
-       src/basic/formats-util.h \
+       src/basic/format-util.h \
        src/basic/nss-util.h
 
 nodist_libbasic_la_SOURCES = \

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 5fce32f769386ee971804882125ea35e32154d4c..5e73753935a8045cd069b5a62e6e2a1e87806b52 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -38,7 +38,7 @@
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "log.h"
 #include "login-util.h"

diff --git a/src/basic/format-util.h b/src/basic/format-util.h
new file mode 100644 (file)
index 0000000..39a185f
--- /dev/null
+++ b/src/basic/format-util.h
@@ -0,0 +1,79 @@
+#pragma once
+
+/***
+  This file is part of systemd.
+
+  Copyright 2015 Ronny Chevalier
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <inttypes.h>
+
+#if SIZEOF_PID_T == 4
+#  define PID_PRI PRIi32
+#elif SIZEOF_PID_T == 2
+#  define PID_PRI PRIi16
+#else
+#  error Unknown pid_t size
+#endif
+#define PID_FMT "%" PID_PRI
+
+#if SIZEOF_UID_T == 4
+#  define UID_FMT "%" PRIu32
+#elif SIZEOF_UID_T == 2
+#  define UID_FMT "%" PRIu16
+#else
+#  error Unknown uid_t size
+#endif
+
+#if SIZEOF_GID_T == 4
+#  define GID_FMT "%" PRIu32
+#elif SIZEOF_GID_T == 2
+#  define GID_FMT "%" PRIu16
+#else
+#  error Unknown gid_t size
+#endif
+
+#if SIZEOF_TIME_T == 8
+#  define PRI_TIME PRIi64
+#elif SIZEOF_TIME_T == 4
+#  define PRI_TIME "li"
+#else
+#  error Unknown time_t size
+#endif
+
+#if SIZEOF_RLIM_T == 8
+#  define RLIM_FMT "%" PRIu64
+#elif SIZEOF_RLIM_T == 4
+#  define RLIM_FMT "%" PRIu32
+#else
+#  error Unknown rlim_t size
+#endif
+
+#if SIZEOF_DEV_T == 8
+#  define DEV_FMT "%" PRIu64
+#elif SIZEOF_DEV_T == 4
+#  define DEV_FMT "%" PRIu32
+#else
+#  error Unknown dev_t size
+#endif
+
+#if SIZEOF_INO_T == 8
+#  define INO_FMT "%" PRIu64
+#elif SIZEOF_INO_T == 4
+#  define INO_FMT "%" PRIu32
+#else
+#  error Unknown ino_t size
+#endif

diff --git a/src/basic/formats-util.h b/src/basic/formats-util.h
deleted file mode 100644 (file)
index 39a185f..0000000
--- a/src/basic/formats-util.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#pragma once
-
-/***
-  This file is part of systemd.
-
-  Copyright 2015 Ronny Chevalier
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <inttypes.h>
-
-#if SIZEOF_PID_T == 4
-#  define PID_PRI PRIi32
-#elif SIZEOF_PID_T == 2
-#  define PID_PRI PRIi16
-#else
-#  error Unknown pid_t size
-#endif
-#define PID_FMT "%" PID_PRI
-
-#if SIZEOF_UID_T == 4
-#  define UID_FMT "%" PRIu32
-#elif SIZEOF_UID_T == 2
-#  define UID_FMT "%" PRIu16
-#else
-#  error Unknown uid_t size
-#endif
-
-#if SIZEOF_GID_T == 4
-#  define GID_FMT "%" PRIu32
-#elif SIZEOF_GID_T == 2
-#  define GID_FMT "%" PRIu16
-#else
-#  error Unknown gid_t size
-#endif
-
-#if SIZEOF_TIME_T == 8
-#  define PRI_TIME PRIi64
-#elif SIZEOF_TIME_T == 4
-#  define PRI_TIME "li"
-#else
-#  error Unknown time_t size
-#endif
-
-#if SIZEOF_RLIM_T == 8
-#  define RLIM_FMT "%" PRIu64
-#elif SIZEOF_RLIM_T == 4
-#  define RLIM_FMT "%" PRIu32
-#else
-#  error Unknown rlim_t size
-#endif
-
-#if SIZEOF_DEV_T == 8
-#  define DEV_FMT "%" PRIu64
-#elif SIZEOF_DEV_T == 4
-#  define DEV_FMT "%" PRIu32
-#else
-#  error Unknown dev_t size
-#endif
-
-#if SIZEOF_INO_T == 8
-#  define INO_FMT "%" PRIu64
-#elif SIZEOF_INO_T == 4
-#  define INO_FMT "%" PRIu32
-#else
-#  error Unknown ino_t size
-#endif

diff --git a/src/basic/log.c b/src/basic/log.c
index 4919d175da2c845c51172fbbcc34615ace787d97..f5cff4cc9f041b3a6c65909b4243e3d92f450cb7 100644 (file)
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -37,7 +37,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "io-util.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index 2568e3834fc5e30353c1bd0aa09f49ab76969d7b..89dfeb4d6a42f94dcf8ecc7431b826164e7ece96 100644 (file)
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <sys/resource.h>
 
-#include "formats-util.h"
+#include "format-util.h"
 #include "macro.h"
 
 #define procfs_file_alloca(pid, field)                                  \

diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
index ee063720edb15abc9c9694ea247f3b0c8515e1a8..ca834df621311b52c85a5972ea2eb27bb51a54cb 100644 (file)
--- a/src/basic/rlimit-util.c
+++ b/src/basic/rlimit-util.c
@@ -22,7 +22,7 @@
 
 #include "alloc-util.h"
 #include "extract-word.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "macro.h"
 #include "missing.h"
 #include "rlimit-util.h"

diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 1662c047050aae55c49dc3d059a001194dd6795e..4ebf10610902aa472e668cd417a2890c2ab5e1f2 100644 (file)
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -34,7 +34,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"

diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index de6c93056eca7c140241fe834520b9621804f1dc..938533d2e7688a28c8ab3e294ca4c013d0641b87 100644 (file)
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -34,7 +34,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "macro.h"
 #include "missing.h"
 #include "parse-util.h"

diff --git a/src/basic/util.c b/src/basic/util.c
index 0f65e4839cf05f43513d781594b3bab4491ca83b..c1b5ca1ef7b7d6f9c0b0717be62746edb2787a34 100644 (file)
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -41,7 +41,7 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "hashmap.h"
 #include "hostname-util.h"
 #include "log.h"

diff --git a/src/basic/util.h b/src/basic/util.h
index bb2fc318ef7dfda3effe6e1f46d0177f305272da..c3802a811cdfcc2c7c97724e50adee054c5468cf 100644 (file)
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -41,7 +41,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "formats-util.h"
+#include "format-util.h"
 #include "macro.h"
 #include "missing.h"
 #include "time-util.h"

diff --git a/src/core/automount.c b/src/core/automount.c
index 7d7a0a6e46bf44b22839a809860401de6813b788..5fa6eb7b1841dedcc26e58140c4e575284c44cf3 100644 (file)
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -34,7 +34,7 @@
 #include "bus-util.h"
 #include "dbus-automount.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "io-util.h"
 #include "label.h"
 #include "mkdir.h"

diff --git a/src/core/busname.c b/src/core/busname.c
index b96ec09e673639b6954e4db3320739c3af63748c..88b758eecbe086fb5ae97b07353224d86aca52f9 100644 (file)
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -27,7 +27,7 @@
 #include "busname.h"
 #include "dbus-busname.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "kdbus.h"
 #include "parse-util.h"
 #include "process-util.h"

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index d7d3d3c8ce0b8f00ed62ae8672c072797f1975e4..5a7922a24974f3b43ab344dedbd8ec144a3f2330 100644 (file)
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -34,7 +34,7 @@
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "install.h"
 #include "log.h"
 #include "path-util.h"

diff --git a/src/core/execute.c b/src/core/execute.c
index 5bb23e2e4a7b8a04823f070427d63dc92b312e4b..c1cda6b5a14066140be7d220c37004695ae1990c 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -71,7 +71,7 @@
 #include "exit-status.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "glob-util.h"
 #include "io-util.h"

diff --git a/src/core/killall.c b/src/core/killall.c
index a8b814e8685cf6ae8721c8cc17f30b36599ef279..3bc19e9c842ba802f83d9acbb9dde998f9461d8a 100644 (file)
--- a/src/core/killall.c
+++ b/src/core/killall.c
@@ -25,7 +25,7 @@
 #include "alloc-util.h"
 #include "def.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "killall.h"
 #include "parse-util.h"
 #include "process-util.h"

diff --git a/src/core/main.c b/src/core/main.c
index 94602611a72ca96a337a38fa0de8997c918b0f1d..aaa352750c03aa500b583cf596a019e3a7c9ff93 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -53,7 +53,7 @@
 #include "fd-util.h"
 #include "fdset.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "hostname-setup.h"
 #include "ima-setup.h"

diff --git a/src/core/mount.c b/src/core/mount.c
index d749e49df5b37f719f4cd8d48008fb4dd2cff46a..43e0f1c7466760e20b39fee5ebff50f3e98b3a8f 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -28,7 +28,7 @@
 #include "dbus-mount.h"
 #include "escape.h"
 #include "exit-status.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fstab-util.h"
 #include "log.h"
 #include "manager.h"

diff --git a/src/core/service.c b/src/core/service.c
index f6acc2f129e09ee919e2df95ccfb974be21079ae..7aa1fba5720a276f6bac5939e2ed6a5bdf4a42c4 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -33,7 +33,7 @@
 #include "exit-status.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "load-dropin.h"
 #include "load-fragment.h"

diff --git a/src/core/socket.c b/src/core/socket.c
index 0b1c4acfecd010a52ecf6a965c113c7d8e8ddbbb..ebacd74a47baeb3327ad1efb678f5361c72415a6 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -36,7 +36,7 @@
 #include "def.h"
 #include "exit-status.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "io-util.h"
 #include "label.h"
 #include "log.h"

diff --git a/src/core/swap.c b/src/core/swap.c
index 2228a254bbc1a06238ac3606c8a66b7d20eac884..b870ac88e3360457c14df1c868c479bf6922ae74 100644 (file)
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -29,7 +29,7 @@
 #include "escape.h"
 #include "exit-status.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fstab-util.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c
index f11df42af389ff9a415b626592941e65f179b6bd..1f5dc6fd8872ba97ce37a41d343bcdf20eb5b9af 100644 (file)
--- a/src/core/unit-printf.c
+++ b/src/core/unit-printf.c
@@ -19,7 +19,7 @@
 
 #include "alloc-util.h"
 #include "cgroup-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "macro.h"
 #include "specifier.h"
 #include "string-util.h"

diff --git a/src/core/unit.c b/src/core/unit.c
index fa1f3d9d4b244860b2ce5628dd154c5c20b8ec38..bba0f5d357c2c879f5eaaa9e90eab41542179d42 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -36,7 +36,7 @@
 #include "escape.h"
 #include "execute.h"
 #include "fileio-label.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "id128-util.h"
 #include "load-dropin.h"
 #include "load-fragment.h"

diff --git a/src/coredump/stacktrace.c b/src/coredump/stacktrace.c
index cc4dad946556d02c32b5c85088b342fd0db0c0d8..778bee9b12956e3a818703da6ae8b4882804dd94 100644 (file)
--- a/src/coredump/stacktrace.c
+++ b/src/coredump/stacktrace.c
@@ -22,7 +22,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "macro.h"
 #include "stacktrace.h"
 #include "string-util.h"

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index 41b2237d1699a44d289308cf0bac4213b3b57dfc..6aeb5ad6148980db297e69ad1dfca88e027962e2 100644 (file)
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -31,7 +31,7 @@
 #include "bus-util.h"
 #include "def.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "initreq.h"
 #include "list.h"
 #include "log.h"

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 42880cca76be35276cb4d2a78fc7151172454495..371b6acc64e74413ab630e1d0ee38cde7e5ab620 100644 (file)
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -30,7 +30,7 @@
 #include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "glob-util.h"
 #include "journal-upload.h"
 #include "log.h"

diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index 3a9fba42a37d1172ca7edf546278313502513dd3..5126c2160eb527fcd408485256f9eaa8878a2a3b 100644 (file)
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -24,7 +24,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "io-util.h"
 #include "journald-console.h"
 #include "journald-server.h"

diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index f64abdd43199d346056da537006372eb1f4cdd2b..18c86445074b30f042d226b543dfd25203fc2e87 100644 (file)
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -28,7 +28,7 @@
 
 #include "escape.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "io-util.h"
 #include "journald-kmsg.h"
 #include "journald-server.h"

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index dee153a4cfe341d974204256fa03c24d1b089019..567f06515f08a317cd1d5881d8536d129c5c54ad 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -40,7 +40,7 @@
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"
 #include "hostname-util.h"

diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 0609b4b6947014db34025c21f6977e725fd5514f..896303fb8544acae1cae15e63a568065e3387429 100644 (file)
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -25,7 +25,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "io-util.h"
 #include "journald-console.h"
 #include "journald-kmsg.h"

diff --git a/src/journal/journald-wall.c b/src/journal/journald-wall.c
index d857ff8d39a2db87f7857e04c631f07ab5fa1355..bfe53ce39d3c7c2d62aac49151b3ffe8182d0ca8 100644 (file)
--- a/src/journal/journald-wall.c
+++ b/src/journal/journald-wall.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "alloc-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "journald-server.h"
 #include "journald-wall.h"
 #include "process-util.h"

diff --git a/src/journal/journald.c b/src/journal/journald.c
index 7f47ca22ddc7b1ae3b09285d2eeab2f988daac19..fc26ef17854cfa8b2442b569127ca0b2fd7cb492 100644 (file)
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -22,7 +22,7 @@
 #include "sd-daemon.h"
 #include "sd-messages.h"
 
-#include "formats-util.h"
+#include "format-util.h"
 #include "journal-authenticate.h"
 #include "journald-kmsg.h"
 #include "journald-server.h"

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 47c77b1ba96562af26fbd5e9239eea10e3abbc8d..56257c41d4221f1cd66879d30e966434a1cf218e 100644 (file)
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -35,7 +35,7 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"
 #include "hostname-util.h"

diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index c4f693dee9dea8b37b8d5b78301160d78a00de1b..349fa57f2d43022604a4248a791d5e93127b0108 100644 (file)
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -30,7 +30,7 @@
 #include "cgroup-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "hexdecoct.h"
 #include "parse-util.h"
 #include "process-util.h"

diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c
index 21a6b20a116db2fa1214d6e95f190371b982e017..f117c98c11a9e9a3a760d6fb564a54ff310d8e94 100644 (file)
--- a/src/libsystemd/sd-bus/bus-dump.c
+++ b/src/libsystemd/sd-bus/bus-dump.c
@@ -25,7 +25,7 @@
 #include "cap-list.h"
 #include "capability-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "locale-util.h"
 #include "macro.h"
 #include "string-util.h"

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index a3427ca33e0aa6dde2859cc1b8c56b60620fb2d2..a897669cc1bedc22dfcd0cfd66d2dd2fa31c1b3d 100644 (file)
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -42,7 +42,7 @@
 #include "capability-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "memfd-util.h"
 #include "parse-util.h"
 #include "stdio-util.h"

diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
index cfd775313905a9faa79c1f5c31dd4571f2dbf939..e6ed15eb71d4d97f4c7993db4d601c7abda5ea19 100644 (file)
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -30,7 +30,7 @@
 #include "bus-message.h"
 #include "bus-socket.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "hexdecoct.h"
 #include "macro.h"
 #include "missing.h"

diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index fc60830059c441c8ad803d45857d5989346ee6bb..0fc6fc90ed135b1926117434e152d57de3a3d4ce 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -30,7 +30,7 @@
 #include "bus-match.h"
 #include "bus-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "log.h"
 #include "macro.h"
 #include "util.h"

diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index 3fcefada3f432e8b81ce51c4d95eaf92125b426a..42ea0badfc6a0d6dc269a8cea7ac7a2fa744c3fe 100644 (file)
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -31,7 +31,7 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "hostname-util.h"
 #include "io-util.h"

diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c
index c1fd7dd33e4abe544691cb8917d89dba5dac048d..9de33d85dbd1dce83e167df759601e5be809171a 100644 (file)
--- a/src/libsystemd/sd-login/test-login.c
+++ b/src/libsystemd/sd-login/test-login.c
@@ -24,7 +24,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"

diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c
index df3b3c922e044dcc951115e75be77503b1184fb5..654a22fe3b5c74e1418747930f41def282809a2e 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-message.c
+++ b/src/libsystemd/sd-netlink/netlink-message.c
@@ -24,7 +24,7 @@
 #include "sd-netlink.h"
 
 #include "alloc-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"

diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c
index c165fa33592710a62c2835023f09977e3f464853..a0fd8a3ac9e58d29711c046979da2d48771f98bb 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-socket.c
+++ b/src/libsystemd/sd-netlink/netlink-socket.c
@@ -24,7 +24,7 @@
 #include "sd-netlink.h"
 
 #include "alloc-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"

diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c
index 09240c7b2a0d1c5161784f4497e40738584d829d..b543b5f20cbe09c95290f2ddee5ec1a6a63e57e7 100644 (file)
--- a/src/libsystemd/sd-netlink/rtnl-message.c
+++ b/src/libsystemd/sd-netlink/rtnl-message.c
@@ -23,7 +23,7 @@
 
 #include "sd-netlink.h"
 
-#include "formats-util.h"
+#include "format-util.h"
 #include "missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"

diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index a1f2b33ad5e3ce6f90f51eb7daf8d9a813b6cf46..a40329d732834a6d7b4042092bf4ce441ec7ea62 100644 (file)
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -33,7 +33,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "libudev-private.h"
 #include "missing.h"
 #include "mount-util.h"

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index f2c37a8623ae84f29945fc8bd0424b50773880f9..7e5a0936987af9db86db812aafd56718391d449c 100644 (file)
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -29,7 +29,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "strv.h"

diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index 0cef88a82de98501aff137592a9690c3b0d0f6ce..1b69f4b9ca77b449f1abeac11c2f9c7c8e757058 100644 (file)
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -25,7 +25,7 @@
 #include "dirent-util.h"
 #include "escape.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "logind-acl.h"
 #include "set.h"
 #include "string-util.h"

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index a950409254e0ee4e03d254cdbf411ed085d3b3a6..91225a536374dfad1c8bf3a1ed187f73328bb6ff 100644 (file)
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -23,7 +23,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "conf-parser.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "logind-action.h"
 #include "process-util.h"
 #include "sleep-config.h"

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 0a84d75e249100b91c4c013adc6804f5a4ffd9ef..23ad5d7c6a1d0299d5c482bba1116b60f0949487 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -34,7 +34,7 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio-label.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "logind.h"
 #include "mkdir.h"

diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index a7e5c01ef38a16769c5a1584a37a06cfb61c185c..5ca42b1ca2ae2c4d14cc4f73f23e25d181b3112e 100644 (file)
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -26,7 +26,7 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "logind-inhibit.h"
 #include "mkdir.h"
 #include "parse-util.h"

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index ecc7bd2e5b9b28b833dd869225a5f342952805cf..f0d8a1f55452c3af65016a21655a18b0e265c89d 100644 (file)
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -27,7 +27,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "logind-acl.h"
 #include "logind-seat.h"
 #include "mkdir.h"

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index e83c37a5ac39773d42fbf7a3516398b926c72dfd..d8bb1ea0a84e603469f672636abff92627e25d38 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -35,7 +35,7 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "io-util.h"
 #include "logind-session.h"
 #include "mkdir.h"

diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index af6392e02570ec8ac5a9985f418179ed2a383d88..987c63014f750a598e8ee9b0127740f27e8f53ea 100644 (file)
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -22,7 +22,7 @@
 
 #include "alloc-util.h"
 #include "bus-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "logind-user.h"
 #include "logind.h"
 #include "signal-util.h"

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 2dc5fa76658272d283985a93cc378ae63737585d..0d1417ea16151014c2c9f453c93a699f7fae2d10 100644 (file)
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -32,7 +32,7 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"
 #include "label.h"

diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c
index 29ab00eb1f7d1e34379c6972aaca420536ff15d5..311751c2db2035d1d8691dff71661c1d2f492e5d 100644 (file)
--- a/src/login/logind-utmp.c
+++ b/src/login/logind-utmp.c
@@ -29,7 +29,7 @@
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "logind.h"
 #include "special.h"
 #include "strv.h"

diff --git a/src/login/logind.c b/src/login/logind.c
index a9841a3832e69ef011fb27ea844f6182ac418847..19bae294a4a22aee0ff51ae0569cf19c50b3e709 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -32,7 +32,7 @@
 #include "def.h"
 #include "dirent-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "logind.h"
 #include "selinux-util.h"
 #include "signal-util.h"

diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index b0f75b2a21c4941ec8fd5f81c11b55eb533bb1b1..dab082a26ee9269f69b8d895bdef72c13a090553 100644 (file)
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -36,7 +36,7 @@
 #include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "hostname-util.h"
 #include "login-util.h"
 #include "macro.h"

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 5ca18ff87e88c16c07d5f99c6114b3ee297ad36f..28e4867cb32abc8c4d3619c6937bc2c5822a6fd5 100644 (file)
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -37,7 +37,7 @@
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "in-addr-util.h"
 #include "local-addresses.h"

diff --git a/src/machine/machine.c b/src/machine/machine.c
index 9e7b6cc03dd2116284d8df62e22f0b5beaa3e492..eb4b35d52a5e298e595825bc7baada19e6261551 100644 (file)
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -30,7 +30,7 @@
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "hashmap.h"
 #include "machine-dbus.h"
 #include "machine.h"

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index e40f40a263374e799bd683a1973bc6b5ec44baff..3ee3938ebb779f3b7d4f9bb9aae7a6c01fcdb655 100644 (file)
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -30,7 +30,7 @@
 #include "cgroup-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "hostname-util.h"
 #include "image-dbus.h"
 #include "io-util.h"

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 57121945f3d93100ce94e9c89aae73a82175d542..8719e01de92d3cf979a3ed2a2bffc3e230b06a3c 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -29,7 +29,7 @@
 #include "cgroup-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "hostname-util.h"
 #include "label.h"
 #include "machine-image.h"

diff --git a/src/notify/notify.c b/src/notify/notify.c
index 49f97c61d983d65e044eaef7f3c7a5d2c9687a63..70b6f868b994c0a5762b76b2fd8c5320b6ac73d1 100644 (file)
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -27,7 +27,7 @@
 
 #include "alloc-util.h"
 #include "env-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "log.h"
 #include "parse-util.h"
 #include "string-util.h"

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 673e61691195fde8d2dfb456779c74159c0480f8..7cff3f437c3327cf9608a08424f7c6a3981b1891 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -57,7 +57,7 @@
 #include "fd-util.h"
 #include "fdset.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "gpt.h"
 #include "hostname-util.h"

diff --git a/src/run/run.c b/src/run/run.c
index 8f1cc9e2e3913a51d470661246e61380b9cab545..99f03465b061f0cfd5279b38feb789ed30a74313 100644 (file)
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -30,7 +30,7 @@
 #include "calendarspec.h"
 #include "env-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 2597cfc6486af048f15dd8cac5eb756efa65471c..3e877920da96174402f2b25616ca3920c1790c26 100644 (file)
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -43,7 +43,7 @@
 #include "ask-password-api.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "io-util.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index 4db6cefb6e1159e144cd937476128223f9f90ce5..5d21742a096b968de6ffbdc24625384b7bad9fa7 100644 (file)
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -28,7 +28,7 @@
 #include "cgroup-show.h"
 #include "cgroup-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "locale-util.h"
 #include "macro.h"
 #include "output-mode.h"

diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index d5db604f031a82096565d720050d6c347c633d27..f2d1555c132c6f806b2ee40f32b812272d8401b3 100644 (file)
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -36,7 +36,7 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "log.h"
 #include "macro.h"
 #include "string-util.h"

diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index 007c632f3592b066ccaa60904137f05914b17d5a..823fb61cdadc3dc9f55c6f007dc4cfd89ad6c949 100644 (file)
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "formats-util.h"
+#include "format-util.h"
 #include "install-printf.h"
 #include "install.h"
 #include "macro.h"

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 5ad5ade31e5ff7a18b92154ecc3096fb6c9c3aa7..99b76714e069c1d189ab8b160ed1b5e10ade0d06 100644 (file)
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -33,7 +33,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "hashmap.h"
 #include "hostname-util.h"
 #include "io-util.h"

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 9e723b02619c40c3554d965898465b83189e68b9..af5b18c0ed15fafbeb9b47b7b3c3578a8189a023 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -50,7 +50,7 @@
 #include "exit-status.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "glob-util.h"
 #include "hostname-util.h"

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 0684f58fcd099568e31c5e29137ed06433d73a94..17b966eb5266ad0de67c10e69c878477e8d7eb1d 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -30,7 +30,7 @@
 #include "def.h"
 #include "fd-util.h"
 #include "fileio-label.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "hashmap.h"
 #include "path-util.h"
 #include "selinux-util.h"

diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index c24c784e9be811d277332f7c73319bbf57096b8c..c60fb631fad9923678f0a7b3e07c73fd7619d20a 100644 (file)
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -21,7 +21,7 @@
 #include "cgroup-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "stat-util.h"

diff --git a/src/test/test-log.c b/src/test/test-log.c
index 55a2f9d23b9dcda7f028083725eec84c181d0cd8..ae9e113efba739e2274088137f517a1a571f13b0 100644 (file)
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <unistd.h>
 
-#include "formats-util.h"
+#include "format-util.h"
 #include "log.h"
 #include "util.h"
 

diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
index f35e6793b78bec8df52e962841a8c8edff8d1c9d..a7c86d155a969d08b8b260fae393732b441309ed 100644 (file)
--- a/src/test/test-tmpfiles.c
+++ b/src/test/test-tmpfiles.c
@@ -25,7 +25,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "log.h"
 #include "string-util.h"

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 97a564d5a2d66898b81bdcbbd391868503576627..b881d774a0ece70e23755d2449d8250720634762 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -47,7 +47,7 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "glob-util.h"
 #include "io-util.h"

diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 7717ac7924aa2b36fe8c67442c60fcbbd0fbe903..dbefbbe175da06ba52ab93a9e0c43b43a892687a 100644 (file)
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -20,7 +20,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "socket-util.h"
 #include "udev.h"
 

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 54cd741bb165cd0debcb7ba8abbbe232e197a48d..304a28777b4bbe27110bbed2b140fce173c232fa 100644 (file)
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -32,7 +32,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "netlink-util.h"
 #include "process-util.h"
 #include "signal-util.h"

diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 43004bc0bcca6e1dd35caa74156af928e3d6fdf1..e94a8143887092d86e5fbf0db97bc2f2231ffe3e 100644 (file)
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "selinux-util.h"
 #include "smack-util.h"

diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
index f656c2198e7dd3541b46ca50f8ed3fb936e156eb..f6318343415150369cc8335ca6d32775e9b3415f 100644 (file)
--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
@@ -26,7 +26,7 @@
 #include <time.h>
 
 #include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "udev-util.h"
 #include "udev.h"
 

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index badbab62057e8075f0317aa92e3320a699ea650a..d336ee003c27c3429e0dcc57da784df1bbf4e8cb 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -49,7 +49,7 @@
 #include "dev-setup.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"
 #include "io-util.h"

diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index a8efe8e91faa05ede8665bf293eb6f8ea799224a..ae9859ccadd88821a792ca1f6831c7fa3eb84b63 100644 (file)
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -30,7 +30,7 @@
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "log.h"
 #include "macro.h"
 #include "special.h"