diff options
86 files changed, 109 insertions, 113 deletions
diff --git a/Makefile.am b/Makefile.am index 73144b165c..0b4beaddf9 100644 --- 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/configure.ac b/configure.ac index 1cee7adbb6..7f6b3b937c 100644 --- a/configure.ac +++ b/configure.ac @@ -216,25 +216,21 @@ AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [-flto])], [AC_MSG_RESULT([disabling -flto as requested])])], [AC_MSG_RESULT([skipping -flto, optimization not enabled])]) -AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags") AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], [CC_CHECK_FLAGS_APPEND([with_cppflags], [CPPFLAGS], [\ -Wp,-D_FORTIFY_SOURCE=2])], [AC_MSG_RESULT([skipping -D_FORTIFY_SOURCE, optimization not enabled])]) -AC_SUBST([OUR_CPPFLAGS], "$with_cppflags $sanitizer_cppflags") AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], [CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\ -Wl,--gc-sections])], [AC_MSG_RESULT([skipping --gc-sections, optimization not enabled])]) -AC_SUBST([OUR_CFLAGS], "$with_ldflags $sanitizer_cflags") AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -ffunction-sections -fdata-sections])], [AC_MSG_RESULT([skipping -ffunction/data-section, optimization not enabled])]) -AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags") CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\ -Wl,--as-needed \ @@ -243,6 +239,9 @@ CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\ -Wl,-z,now \ -pie \ -Wl,-fuse-ld=gold]) + +AC_SUBST([OUR_CPPFLAGS], "$with_cppflags $sanitizer_cppflags") +AC_SUBST([OUR_CFLAGS], "-D__SANE_USERSPACE_TYPES__ $with_cflags $sanitizer_cflags") AC_SUBST([OUR_LDFLAGS], "$with_ldflags $sanitizer_ldflags") AC_CHECK_SIZEOF(pid_t) diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 5fce32f769..5e73753935 100644 --- 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/formats-util.h b/src/basic/format-util.h index 39a185f59b..39a185f59b 100644 --- a/src/basic/formats-util.h +++ b/src/basic/format-util.h diff --git a/src/basic/log.c b/src/basic/log.c index 4919d175da..f5cff4cc9f 100644 --- 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 2568e3834f..89dfeb4d6a 100644 --- 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 ee063720ed..ca834df621 100644 --- 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 1662c04705..4ebf106109 100644 --- 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/time-util.c b/src/basic/time-util.c index fedff1362c..cbdfd55ada 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -309,7 +309,7 @@ static char *format_timestamp_internal( if (n + 8 > l) return NULL; /* Microseconds part doesn't fit. */ - sprintf(buf + n, ".%06llu", (unsigned long long) (t % USEC_PER_SEC)); + sprintf(buf + n, ".%06"PRI_USEC, t % USEC_PER_SEC); } /* Append the timezone */ @@ -499,11 +499,11 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) { if (j > 0) { k = snprintf(p, l, - "%s"USEC_FMT".%0*llu%s", + "%s"USEC_FMT".%0*"PRI_USEC"%s", p > buf ? " " : "", a, j, - (unsigned long long) b, + b, table[i].suffix); t = 0; @@ -1320,7 +1320,7 @@ unsigned long usec_to_jiffies(usec_t u) { r = sysconf(_SC_CLK_TCK); assert(r > 0); - hz = (unsigned long) r; + hz = r; } return DIV_ROUND_UP(u , USEC_PER_SEC / hz); diff --git a/src/basic/time-util.h b/src/basic/time-util.h index 558b0b5b7f..f67a4474ed 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -29,8 +29,10 @@ typedef uint64_t usec_t; typedef uint64_t nsec_t; -#define NSEC_FMT "%" PRIu64 -#define USEC_FMT "%" PRIu64 +#define PRI_NSEC PRIu64 +#define PRI_USEC PRIu64 +#define NSEC_FMT "%" PRI_NSEC +#define USEC_FMT "%" PRI_USEC #include "macro.h" diff --git a/src/basic/user-util.c b/src/basic/user-util.c index de6c93056e..938533d2e7 100644 --- 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 0f65e4839c..c1b5ca1ef7 100644 --- 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 bb2fc318ef..c3802a811c 100644 --- 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 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" diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c index 6bd0e925eb..d55d896df4 100644 --- a/src/coredump/coredump.c +++ b/src/coredump/coredump.c @@ -111,7 +111,7 @@ static CoredumpStorage arg_storage = COREDUMP_STORAGE_EXTERNAL; static bool arg_compress = true; static uint64_t arg_process_size_max = PROCESS_SIZE_MAX; static uint64_t arg_external_size_max = EXTERNAL_SIZE_MAX; -static size_t arg_journal_size_max = JOURNAL_SIZE_MAX; +static uint64_t arg_journal_size_max = JOURNAL_SIZE_MAX; static uint64_t arg_keep_free = (uint64_t) -1; static uint64_t arg_max_use = (uint64_t) -1; @@ -708,7 +708,7 @@ static int submit_coredump( coredump_filename = strjoina("COREDUMP_FILENAME=", filename); IOVEC_SET_STRING(iovec[n_iovec++], coredump_filename); } else if (arg_storage == COREDUMP_STORAGE_EXTERNAL) - log_info("The core will not be stored: size %zu is greater than %zu (the configured maximum)", + log_info("The core will not be stored: size %"PRIu64" is greater than %"PRIu64" (the configured maximum)", coredump_size, arg_external_size_max); /* Vacuum again, but exclude the coredump we just created */ @@ -738,7 +738,7 @@ static int submit_coredump( else log_warning_errno(r, "Failed to generate stack trace: %m"); } else - log_debug("Not generating stack trace: core size %zu is greater than %zu (the configured maximum)", + log_debug("Not generating stack trace: core size %"PRIu64" is greater than %"PRIu64" (the configured maximum)", coredump_size, arg_process_size_max); if (!core_message) @@ -765,7 +765,7 @@ log: } else log_warning_errno(r, "Failed to attach the core to the journal entry: %m"); } else - log_info("The core will not be stored: size %zu is greater than %zu (the configured maximum)", + log_info("The core will not be stored: size %"PRIu64" is greater than %"PRIu64" (the configured maximum)", coredump_size, arg_journal_size_max); } diff --git a/src/coredump/stacktrace.c b/src/coredump/stacktrace.c index cc4dad9465..778bee9b12 100644 --- 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/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index e64d5bb231..52cde493e5 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -429,10 +429,10 @@ static int add_automount( "Documentation=man:systemd-gpt-auto-generator(8)\n" "[Automount]\n" "Where=%s\n" - "TimeoutIdleSec=%lld\n", + "TimeoutIdleSec="USEC_FMT"\n", description, where, - (unsigned long long)timeout / USEC_PER_SEC); + timeout / USEC_PER_SEC); r = fflush_and_check(f); if (r < 0) diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c index 41b2237d16..6aeb5ad614 100644 --- 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 42880cca76..371b6acc64 100644 --- 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 3a9fba42a3..5126c2160e 100644 --- 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 f64abdd431..18c8644507 100644 --- 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 dee153a4cf..567f06515f 100644 --- 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 0609b4b694..896303fb85 100644 --- 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 d857ff8d39..bfe53ce39d 100644 --- 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 7f47ca22dd..fc26ef1785 100644 --- 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 47c77b1ba9..56257c41d4 100644 --- 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-control.c b/src/libsystemd/sd-bus/bus-control.c index 52128e7b5c..9e58ffbd88 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -264,7 +264,7 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { if ((flags & KDBUS_LIST_UNIQUE) && name->id != previous_id && !(name->flags & KDBUS_HELLO_ACTIVATOR)) { char *n; - if (asprintf(&n, ":1.%llu", (unsigned long long) name->id) < 0) { + if (asprintf(&n, ":1.%llu", name->id) < 0) { r = -ENOMEM; goto fail; } @@ -711,7 +711,7 @@ int bus_get_name_creds_kdbus( } if (mask & SD_BUS_CREDS_UNIQUE_NAME) { - if (asprintf(&c->unique_name, ":1.%llu", (unsigned long long) conn_info->id) < 0) { + if (asprintf(&c->unique_name, ":1.%llu", conn_info->id) < 0) { r = -ENOMEM; goto fail; } diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c index c4f693dee9..349fa57f2d 100644 --- 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 21a6b20a11..f117c98c11 100644 --- 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 a3427ca33e..c82caeb3fc 100644 --- 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" @@ -848,8 +848,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { if (k->src_id == KDBUS_SRC_ID_KERNEL) bus_message_set_sender_driver(bus, m); else { - xsprintf(m->sender_buffer, ":1.%llu", - (unsigned long long)k->src_id); + xsprintf(m->sender_buffer, ":1.%llu", k->src_id); m->sender = m->creds.unique_name = m->sender_buffer; } @@ -860,8 +859,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { else if (k->dst_id == KDBUS_DST_ID_NAME) m->destination = bus->unique_name; /* fill in unique name if the well-known name is missing */ else { - xsprintf(m->destination_buffer, ":1.%llu", - (unsigned long long)k->dst_id); + xsprintf(m->destination_buffer, ":1.%llu", k->dst_id); m->destination = m->destination_buffer; } @@ -1035,7 +1033,7 @@ int bus_kernel_take_fd(sd_bus *b) { b->bloom_size = (size_t) bloom->size; b->bloom_n_hash = (unsigned) bloom->n_hash; - if (asprintf(&b->unique_name, ":1.%llu", (unsigned long long) hello->id) < 0) { + if (asprintf(&b->unique_name, ":1.%llu", hello->id) < 0) { r = -ENOMEM; goto fail; } @@ -1207,7 +1205,7 @@ int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m, bool hint_sync_call return r; } } else { - log_debug("Ignoring message with unknown payload type %llu.", (unsigned long long) k->payload_type); + log_debug("Ignoring message with unknown payload type %llu.", k->payload_type); close_kdbus_msg(bus, k); } } @@ -1268,7 +1266,7 @@ static int translate_name_change( if (d->type == KDBUS_ITEM_NAME_ADD || (d->name_change.old_id.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) old_owner[0] = 0; else - sprintf(old_owner, ":1.%llu", (unsigned long long) d->name_change.old_id.id); + sprintf(old_owner, ":1.%llu", d->name_change.old_id.id); if (d->type == KDBUS_ITEM_NAME_REMOVE || (d->name_change.new_id.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) { @@ -1277,7 +1275,7 @@ static int translate_name_change( new_owner[0] = 0; } else - sprintf(new_owner, ":1.%llu", (unsigned long long) d->name_change.new_id.id); + sprintf(new_owner, ":1.%llu", d->name_change.new_id.id); return push_name_owner_changed(bus, d->name_change.name, old_owner, new_owner, ts); } @@ -1419,7 +1417,7 @@ int bus_kernel_read_message(sd_bus *bus, bool hint_priority, int64_t priority) { r = bus_kernel_translate_message(bus, k); close_kdbus_msg(bus, k); } else { - log_debug("Ignoring message with unknown payload type %llu.", (unsigned long long) k->payload_type); + log_debug("Ignoring message with unknown payload type %llu.", k->payload_type); r = 0; close_kdbus_msg(bus, k); } diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c index cfd7753139..e6ed15eb71 100644 --- 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 fc60830059..0fc6fc90ed 100644 --- 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 3fcefada3f..42ea0badfc 100644 --- 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 c1fd7dd33e..9de33d85db 100644 --- 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 df3b3c922e..654a22fe3b 100644 --- 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 c165fa3359..a0fd8a3ac9 100644 --- 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 09240c7b2a..b543b5f20c 100644 --- 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 a1f2b33ad5..a40329d732 100644 --- 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 f2c37a8623..7e5a093698 100644 --- 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 0cef88a82d..1b69f4b9ca 100644 --- 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 a950409254..91225a5363 100644 --- 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 0a84d75e24..23ad5d7c6a 100644 --- 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 a7e5c01ef3..5ca42b1ca2 100644 --- 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 ecc7bd2e5b..f0d8a1f554 100644 --- 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 e83c37a5ac..d8bb1ea0a8 100644 --- 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 af6392e025..987c63014f 100644 --- 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 2dc5fa7665..0d1417ea16 100644 --- 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 29ab00eb1f..311751c2db 100644 --- 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 a9841a3832..19bae294a4 100644 --- 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 b0f75b2a21..dab082a26e 100644 --- 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 5ca18ff87e..28e4867cb3 100644 --- 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 9e7b6cc03d..eb4b35d52a 100644 --- 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 e40f40a263..3ee3938ebb 100644 --- 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 57121945f3..8719e01de9 100644 --- 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 49f97c61d9..70b6f868b9 100644 --- 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 1563644e4b..c8b18bcb88 100644 --- 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 8f1cc9e2e3..99f03465b0 100644 --- 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 2597cfc648..3e877920da 100644 --- 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 4db6cefb6e..5d21742a09 100644 --- 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 d5db604f03..f2d1555c13 100644 --- 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 007c632f35..823fb61cda 100644 --- 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 5ad5ade31e..75ea25c8ac 100644 --- 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" @@ -223,10 +223,7 @@ static int output_timestamp_monotonic(FILE *f, sd_journal *j, const char *monoto if (r < 0) return log_error_errno(r, "Failed to get monotonic timestamp: %m"); - fprintf(f, "[%5llu.%06llu]", - (unsigned long long) (t / USEC_PER_SEC), - (unsigned long long) (t % USEC_PER_SEC)); - + fprintf(f, "[%5"PRI_USEC".%06"PRI_USEC"]", t / USEC_PER_SEC, t % USEC_PER_SEC); return 1 + 5 + 1 + 6 + 1; } @@ -268,7 +265,7 @@ static int output_timestamp_realtime(FILE *f, sd_journal *j, OutputMode mode, Ou switch (mode) { case OUTPUT_SHORT_UNIX: - xsprintf(buf, "%10llu.%06llu", (unsigned long long) t, (unsigned long long) (x % USEC_PER_SEC)); + xsprintf(buf, "%10"PRI_TIME".%06"PRIu64, t, x % USEC_PER_SEC); break; case OUTPUT_SHORT_ISO: @@ -292,7 +289,7 @@ static int output_timestamp_realtime(FILE *f, sd_journal *j, OutputMode mode, Ou assert(sizeof(buf) > strlen(buf)); k = sizeof(buf) - strlen(buf); - r = snprintf(buf + strlen(buf), k, ".%06llu", (unsigned long long) (x % USEC_PER_SEC)); + r = snprintf(buf + strlen(buf), k, ".%06"PRIu64, x % USEC_PER_SEC); if (r <= 0 || (size_t) r >= k) { /* too long? */ log_error("Failed to format precise time"); return -EINVAL; diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 9e723b0261..af5b18c0ed 100644 --- 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 0684f58fcd..17b966eb52 100644 --- 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 c24c784e9b..c60fb631fa 100644 --- 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 55a2f9d23b..ae9e113efb 100644 --- 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 f35e6793b7..a7c86d155a 100644 --- 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/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index d5e16db3a0..a455652a27 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -376,12 +376,12 @@ static int manager_adjust_clock(Manager *m, double offset, int leap_sec) { m->drift_ppm = tmx.freq / 65536; log_debug(" status : %04i %s\n" - " time now : %li.%03llu\n" + " time now : %li.%03"PRI_USEC"\n" " constant : %li\n" " offset : %+.3f sec\n" " freq offset : %+li (%i ppm)\n", tmx.status, tmx.status & STA_UNSYNC ? "unsync" : "sync", - tmx.time.tv_sec, (unsigned long long) (tmx.time.tv_usec / NSEC_PER_MSEC), + tmx.time.tv_sec, tmx.time.tv_usec / NSEC_PER_MSEC, tmx.constant, (double)tmx.offset / NSEC_PER_SEC, tmx.freq, m->drift_ppm); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 97a564d5a2..b881d774a0 100644 --- 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 7717ac7924..dbefbbe175 100644 --- 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 54cd741bb1..304a28777b 100644 --- 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 43004bc0bc..e94a814388 100644 --- 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 f656c2198e..f631834341 100644 --- 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 badbab6205..d336ee003c 100644 --- 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 a8efe8e91f..ae9859ccad 100644 --- 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" |