]> code.ossystems Code Review - openembedded-core.git/commitdiff
systemd: Add more ugly casts to fix build with musl
authorAndreas Müller <schnitzeltony@gmail.com>
Thu, 3 Jun 2021 15:43:07 +0000 (17:43 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 6 Jun 2021 22:14:12 +0000 (23:14 +0100)
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch

index af1a6bb0531a301f6f978a84f178cf3de92775c6..940db4c5c61447d5604757fc2c93d573daa2619f 100644 (file)
@@ -47,9 +47,18 @@ index b7e18768e3..3195ab205d 100644
  #if SIZEOF_DEV_T == 8
  #  define DEV_FMT "%" PRIu64
 diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
-index 23d108d5df..94373c9422 100644
+index 23d108d5df..b037734ee3 100644
 --- a/src/basic/rlimit-util.c
 +++ b/src/basic/rlimit-util.c
+@@ -43,7 +43,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) {
+             fixed.rlim_max == highest.rlim_max)
+                 return 0;
+-        log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", rlim->rlim_max, rlimit_to_string(resource), fixed.rlim_max);
++        log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", (uintmax_t)rlim->rlim_max, rlimit_to_string(resource), (uintmax_t)fixed.rlim_max);
+         if (setrlimit(resource, &fixed) < 0)
+                 return -errno;
 @@ -308,13 +308,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) {
          if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY)
                  s = strdup("infinity");