Merge pull request #4612 from keszybz/format-strings

Format string tweaks (and a small fix on 32bit)

12 files changed, 12 insertions, 12 deletions

diff --git a/src/core/automount.c b/src/core/automount.c
index 7d7a0a6e46..5fa6eb7b18 100644
--- 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 b96ec09e67..88b758eecb 100644
--- 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 d7d3d3c8ce..5a7922a249 100644
--- 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 5bb23e2e4a..c1cda6b5a1 100644
--- 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 a8b814e868..3bc19e9c84 100644
--- 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 e01fed6b7c..f5f7df838d 100644
--- 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 d749e49df5..43e0f1c746 100644
--- 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 f6acc2f129..7aa1fba572 100644
--- 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 0b1c4acfec..ebacd74a47 100644
--- 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 2228a254bb..b870ac88e3 100644
--- 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 f11df42af3..1f5dc6fd88 100644
--- 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 fa1f3d9d4b..bba0f5d357 100644
--- 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"