summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch30
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch
index e5d9515e86..a6fcd2f5da 100644
--- a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch
+++ b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch
@@ -27,11 +27,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
27 src/core/execute.c | 4 ++-- 27 src/core/execute.c | 4 ++--
28 3 files changed, 8 insertions(+), 14 deletions(-) 28 3 files changed, 8 insertions(+), 14 deletions(-)
29 29
30diff --git a/src/basic/format-util.h b/src/basic/format-util.h 30Index: systemd-stable/src/basic/format-util.h
31index c47fa76ea8ff..14a78d9f5fd0 100644 31===================================================================
32--- a/src/basic/format-util.h 32--- systemd-stable.orig/src/basic/format-util.h
33+++ b/src/basic/format-util.h 33+++ systemd-stable/src/basic/format-util.h
34@@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); 34@@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32
35 # define PRI_TIMEX "li" 35 # define PRI_TIMEX "li"
36 #endif 36 #endif
37 37
@@ -46,11 +46,11 @@ index c47fa76ea8ff..14a78d9f5fd0 100644
46 46
47 #if SIZEOF_DEV_T == 8 47 #if SIZEOF_DEV_T == 8
48 # define DEV_FMT "%" PRIu64 48 # define DEV_FMT "%" PRIu64
49diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c 49Index: systemd-stable/src/basic/rlimit-util.c
50index 2dc13eabc30d..0633cc67f417 100644 50===================================================================
51--- a/src/basic/rlimit-util.c 51--- systemd-stable.orig/src/basic/rlimit-util.c
52+++ b/src/basic/rlimit-util.c 52+++ systemd-stable/src/basic/rlimit-util.c
53@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { 53@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *r
54 if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) 54 if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY)
55 s = strdup("infinity"); 55 s = strdup("infinity");
56 else if (rl->rlim_cur >= RLIM_INFINITY) 56 else if (rl->rlim_cur >= RLIM_INFINITY)
@@ -77,11 +77,11 @@ index 2dc13eabc30d..0633cc67f417 100644
77 77
78 return 1; 78 return 1;
79 } 79 }
80diff --git a/src/core/execute.c b/src/core/execute.c 80Index: systemd-stable/src/core/execute.c
81index 9762dc57443c..4a3421bb3ee6 100644 81===================================================================
82--- a/src/core/execute.c 82--- systemd-stable.orig/src/core/execute.c
83+++ b/src/core/execute.c 83+++ systemd-stable/src/core/execute.c
84@@ -4567,9 +4567,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { 84@@ -4686,9 +4686,9 @@ void exec_context_dump(const ExecContext
85 for (i = 0; i < RLIM_NLIMITS; i++) 85 for (i = 0; i < RLIM_NLIMITS; i++)
86 if (c->rlimit[i]) { 86 if (c->rlimit[i]) {
87 fprintf(f, "%sLimit%s: " RLIM_FMT "\n", 87 fprintf(f, "%sLimit%s: " RLIM_FMT "\n",