| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899 |
- From 48a791aae7a47a2a08e9e60c18054071a43b8cda 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 | 12 ++++++------
- src/core/execute.c | 4 ++--
- 3 files changed, 9 insertions(+), 15 deletions(-)
- --- a/src/basic/format-util.h
- +++ b/src/basic/format-util.h
- @@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32
- # error Unknown timex member 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
- +#define RLIM_FMT "%ju"
-
- #if SIZEOF_DEV_T == 8
- # define DEV_FMT "%" PRIu64
- --- a/src/basic/rlimit-util.c
- +++ b/src/basic/rlimit-util.c
- @@ -44,7 +44,7 @@ int setrlimit_closest(int resource, cons
- 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);
-
- return RET_NERRNO(setrlimit(resource, &fixed));
- }
- @@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *r
- if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY)
- r = free_and_strdup(&s, "infinity");
- else if (rl->rlim_cur >= RLIM_INFINITY)
- - r = asprintf(&s, "infinity:" RLIM_FMT, rl->rlim_max);
- + r = asprintf(&s, "infinity:" RLIM_FMT, (uintmax_t)rl->rlim_max);
- else if (rl->rlim_max >= RLIM_INFINITY)
- - r = asprintf(&s, RLIM_FMT ":infinity", rl->rlim_cur);
- + r = asprintf(&s, RLIM_FMT ":infinity", (uintmax_t)rl->rlim_cur);
- else if (rl->rlim_cur == rl->rlim_max)
- - r = asprintf(&s, RLIM_FMT, rl->rlim_cur);
- + r = asprintf(&s, RLIM_FMT, (uintmax_t)rl->rlim_cur);
- else
- - r = asprintf(&s, RLIM_FMT ":" RLIM_FMT, rl->rlim_cur, rl->rlim_max);
- + r = asprintf(&s, RLIM_FMT ":" RLIM_FMT, (uintmax_t)rl->rlim_cur, (uintmax_t)rl->rlim_max);
- if (r < 0)
- 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;
- }
- --- a/src/core/execute.c
- +++ b/src/core/execute.c
- @@ -5869,9 +5869,9 @@ void exec_context_dump(const ExecContext
- for (unsigned 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) {
|
