| From 4aa91347ae975051dbe4dd2f98a1f4f459f2604f Mon Sep 17 00:00:00 2001 |
| From: Chen Qi <Qi.Chen@windriver.com> |
| Date: Mon, 25 Feb 2019 15:12:41 +0800 |
| Subject: [PATCH] Use uintmax_t for handling rlim_t |
| |
| PRIu{32,64} is not right format to represent rlim_t type |
| therefore use %ju and typecast the rlim_t variables to |
| uintmax_t. |
| |
| Fixes portablility errors like |
| |
| execute.c:3446:36: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=] |
| | fprintf(f, "%s%s: " RLIM_FMT "\n", |
| | ^~~~~~~~ |
| | prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max); |
| | ~~~~~~~~~~~~~~~~~~~~~~ |
| |
| Upstream-Status: Denied [https://github.com/systemd/systemd/pull/7199] |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| [Rebased for v241] |
| Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| |
| --- |
| src/basic/format-util.h | 8 +------- |
| src/basic/rlimit-util.c | 10 +++++----- |
| src/core/execute.c | 4 ++-- |
| 3 files changed, 8 insertions(+), 14 deletions(-) |
| |
| Index: systemd-stable/src/basic/format-util.h |
| =================================================================== |
| --- systemd-stable.orig/src/basic/format-util.h |
| +++ systemd-stable/src/basic/format-util.h |
| @@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32 |
| # define PRI_TIMEX "li" |
| #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 |
| +#define RLIM_FMT "%ju" |
| |
| #if SIZEOF_DEV_T == 8 |
| # define DEV_FMT "%" PRIu64 |
| Index: systemd-stable/src/basic/rlimit-util.c |
| =================================================================== |
| --- systemd-stable.orig/src/basic/rlimit-util.c |
| +++ systemd-stable/src/basic/rlimit-util.c |
| @@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *r |
| if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) |
| s = strdup("infinity"); |
| else if (rl->rlim_cur >= RLIM_INFINITY) |
| - (void) asprintf(&s, "infinity:" RLIM_FMT, rl->rlim_max); |
| + (void) asprintf(&s, "infinity:" RLIM_FMT, (uintmax_t)rl->rlim_max); |
| else if (rl->rlim_max >= RLIM_INFINITY) |
| - (void) asprintf(&s, RLIM_FMT ":infinity", rl->rlim_cur); |
| + (void) asprintf(&s, RLIM_FMT ":infinity", (uintmax_t)rl->rlim_cur); |
| else if (rl->rlim_cur == rl->rlim_max) |
| - (void) asprintf(&s, RLIM_FMT, rl->rlim_cur); |
| + (void) asprintf(&s, RLIM_FMT, (uintmax_t)rl->rlim_cur); |
| else |
| - (void) asprintf(&s, RLIM_FMT ":" RLIM_FMT, rl->rlim_cur, rl->rlim_max); |
| + (void) asprintf(&s, RLIM_FMT ":" RLIM_FMT, (uintmax_t)rl->rlim_cur, (uintmax_t)rl->rlim_max); |
| |
| if (!s) |
| return -ENOMEM; |
| @@ -403,7 +403,7 @@ int rlimit_nofile_safe(void) { |
| |
| rl.rlim_cur = FD_SETSIZE; |
| if (setrlimit(RLIMIT_NOFILE, &rl) < 0) |
| - return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", rl.rlim_cur); |
| + return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", (uintmax_t)rl.rlim_cur); |
| |
| return 1; |
| } |
| Index: systemd-stable/src/core/execute.c |
| =================================================================== |
| --- systemd-stable.orig/src/core/execute.c |
| +++ systemd-stable/src/core/execute.c |
| @@ -4686,9 +4686,9 @@ void exec_context_dump(const ExecContext |
| for (i = 0; i < RLIM_NLIMITS; i++) |
| if (c->rlimit[i]) { |
| fprintf(f, "%sLimit%s: " RLIM_FMT "\n", |
| - prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max); |
| + prefix, rlimit_to_string(i), (uintmax_t)c->rlimit[i]->rlim_max); |
| fprintf(f, "%sLimit%sSoft: " RLIM_FMT "\n", |
| - prefix, rlimit_to_string(i), c->rlimit[i]->rlim_cur); |
| + prefix, rlimit_to_string(i), (uintmax_t)c->rlimit[i]->rlim_cur); |
| } |
| |
| if (c->ioprio_set) { |