diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch | 158 |
1 files changed, 81 insertions, 77 deletions
diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index 8e7a2fb6e4..154e57b540 100644 --- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7e771de87cf728a8678f1f28f391bba3589e2496 Mon Sep 17 00:00:00 2001 | 1 | From 5aeae0ea89f5af74ed5d95bed1d87a03b3801ff0 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 14:18:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:18:21 +0800 |
4 | Subject: [PATCH] src/basic/missing.h: check for missing strndupa | 4 | Subject: [PATCH 05/26] src/basic/missing.h: check for missing strndupa |
5 | 5 | ||
6 | include missing.h for definition of strndupa | 6 | include missing.h for definition of strndupa |
7 | 7 | ||
@@ -15,7 +15,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | |||
15 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 15 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
16 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | 16 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
17 | [rebased for systemd 244] | 17 | [rebased for systemd 244] |
18 | 18 | [Rebased for v247] | |
19 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | ||
19 | --- | 20 | --- |
20 | meson.build | 1 + | 21 | meson.build | 1 + |
21 | src/backlight/backlight.c | 1 + | 22 | src/backlight/backlight.c | 1 + |
@@ -70,31 +71,31 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
70 | 50 files changed, 61 insertions(+) | 71 | 50 files changed, 61 insertions(+) |
71 | 72 | ||
72 | diff --git a/meson.build b/meson.build | 73 | diff --git a/meson.build b/meson.build |
73 | index 9187439bdd..bea9935a91 100644 | 74 | index 6aa47fc755..0d0fa4963c 100644 |
74 | --- a/meson.build | 75 | --- a/meson.build |
75 | +++ b/meson.build | 76 | +++ b/meson.build |
76 | @@ -527,6 +527,7 @@ foreach ident : [ | 77 | @@ -535,6 +535,7 @@ foreach ident : [ |
77 | #include <unistd.h> | ||
78 | #include <signal.h> | ||
79 | #include <sys/wait.h>'''], | 78 | #include <sys/wait.h>'''], |
79 | ['mallinfo', '''#include <malloc.h>'''], | ||
80 | ['close_range', '''#include <unistd.h>'''], | ||
80 | + ['strndupa' , '''#include <string.h>'''], | 81 | + ['strndupa' , '''#include <string.h>'''], |
81 | ] | 82 | ] |
82 | 83 | ||
83 | have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') | 84 | have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') |
84 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c | 85 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c |
85 | index 3a644363e1..73946a829b 100644 | 86 | index d1b6a81e33..38b7008371 100644 |
86 | --- a/src/backlight/backlight.c | 87 | --- a/src/backlight/backlight.c |
87 | +++ b/src/backlight/backlight.c | 88 | +++ b/src/backlight/backlight.c |
88 | @@ -17,6 +17,7 @@ | 89 | @@ -19,6 +19,7 @@ |
89 | #include "string-util.h" | 90 | #include "string-util.h" |
90 | #include "strv.h" | 91 | #include "strv.h" |
91 | #include "util.h" | 92 | #include "util.h" |
92 | +#include "missing_stdlib.h" | 93 | +#include "missing_stdlib.h" |
93 | 94 | ||
94 | static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { | 95 | static int help(void) { |
95 | const char *subsystem, *sysname, *value; | 96 | _cleanup_free_ char *link = NULL; |
96 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | 97 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c |
97 | index e94fcfad02..856a7068b0 100644 | 98 | index f28bf1866a..bb960f183c 100644 |
98 | --- a/src/basic/cgroup-util.c | 99 | --- a/src/basic/cgroup-util.c |
99 | +++ b/src/basic/cgroup-util.c | 100 | +++ b/src/basic/cgroup-util.c |
100 | @@ -38,6 +38,7 @@ | 101 | @@ -38,6 +38,7 @@ |
@@ -106,7 +107,7 @@ index e94fcfad02..856a7068b0 100644 | |||
106 | static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { | 107 | static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { |
107 | _cleanup_free_ char *fs = NULL; | 108 | _cleanup_free_ char *fs = NULL; |
108 | diff --git a/src/basic/env-util.c b/src/basic/env-util.c | 109 | diff --git a/src/basic/env-util.c b/src/basic/env-util.c |
109 | index b8dc98915f..5049b37594 100644 | 110 | index a84863ff22..d4f5d57231 100644 |
110 | --- a/src/basic/env-util.c | 111 | --- a/src/basic/env-util.c |
111 | +++ b/src/basic/env-util.c | 112 | +++ b/src/basic/env-util.c |
112 | @@ -15,6 +15,7 @@ | 113 | @@ -15,6 +15,7 @@ |
@@ -115,13 +116,13 @@ index b8dc98915f..5049b37594 100644 | |||
115 | #include "utf8.h" | 116 | #include "utf8.h" |
116 | +#include "missing_stdlib.h" | 117 | +#include "missing_stdlib.h" |
117 | 118 | ||
118 | #define VALID_CHARS_ENV_NAME \ | 119 | /* We follow bash for the character set. Different shells have different rules. */ |
119 | DIGITS LETTERS \ | 120 | #define VALID_BASH_ENV_NAME_CHARS \ |
120 | diff --git a/src/basic/log.c b/src/basic/log.c | 121 | diff --git a/src/basic/log.c b/src/basic/log.c |
121 | index c6fe203808..b7ef932d28 100644 | 122 | index d4054cf46a..b608863e45 100644 |
122 | --- a/src/basic/log.c | 123 | --- a/src/basic/log.c |
123 | +++ b/src/basic/log.c | 124 | +++ b/src/basic/log.c |
124 | @@ -35,6 +35,7 @@ | 125 | @@ -36,6 +36,7 @@ |
125 | #include "terminal-util.h" | 126 | #include "terminal-util.h" |
126 | #include "time-util.h" | 127 | #include "time-util.h" |
127 | #include "utf8.h" | 128 | #include "utf8.h" |
@@ -130,7 +131,7 @@ index c6fe203808..b7ef932d28 100644 | |||
130 | #define SNDBUF_SIZE (8*1024*1024) | 131 | #define SNDBUF_SIZE (8*1024*1024) |
131 | 132 | ||
132 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h | 133 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h |
133 | index 188a8d4406..1e16ec287a 100644 | 134 | index 8c76f93eb2..9068bfb4f0 100644 |
134 | --- a/src/basic/missing_stdlib.h | 135 | --- a/src/basic/missing_stdlib.h |
135 | +++ b/src/basic/missing_stdlib.h | 136 | +++ b/src/basic/missing_stdlib.h |
136 | @@ -11,3 +11,15 @@ | 137 | @@ -11,3 +11,15 @@ |
@@ -150,10 +151,10 @@ index 188a8d4406..1e16ec287a 100644 | |||
150 | + }) | 151 | + }) |
151 | +#endif | 152 | +#endif |
152 | diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c | 153 | diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c |
153 | index 6ebc2b95fd..88f4359bab 100644 | 154 | index f91f8f7a08..fb31596216 100644 |
154 | --- a/src/basic/mkdir.c | 155 | --- a/src/basic/mkdir.c |
155 | +++ b/src/basic/mkdir.c | 156 | +++ b/src/basic/mkdir.c |
156 | @@ -13,6 +13,7 @@ | 157 | @@ -14,6 +14,7 @@ |
157 | #include "stat-util.h" | 158 | #include "stat-util.h" |
158 | #include "stdio-util.h" | 159 | #include "stdio-util.h" |
159 | #include "user-util.h" | 160 | #include "user-util.h" |
@@ -162,10 +163,10 @@ index 6ebc2b95fd..88f4359bab 100644 | |||
162 | int mkdir_safe_internal( | 163 | int mkdir_safe_internal( |
163 | const char *path, | 164 | const char *path, |
164 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c | 165 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c |
165 | index 44f0438cf4..54b4133343 100644 | 166 | index 5d4dafe3a5..70749750d4 100644 |
166 | --- a/src/basic/parse-util.c | 167 | --- a/src/basic/parse-util.c |
167 | +++ b/src/basic/parse-util.c | 168 | +++ b/src/basic/parse-util.c |
168 | @@ -19,6 +19,7 @@ | 169 | @@ -22,6 +22,7 @@ |
169 | #include "stat-util.h" | 170 | #include "stat-util.h" |
170 | #include "string-util.h" | 171 | #include "string-util.h" |
171 | #include "strv.h" | 172 | #include "strv.h" |
@@ -174,7 +175,7 @@ index 44f0438cf4..54b4133343 100644 | |||
174 | int parse_boolean(const char *v) { | 175 | int parse_boolean(const char *v) { |
175 | if (!v) | 176 | if (!v) |
176 | diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c | 177 | diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c |
177 | index 52968dee34..2f4f7e3dcd 100644 | 178 | index 96b82170d0..71342b46af 100644 |
178 | --- a/src/basic/path-lookup.c | 179 | --- a/src/basic/path-lookup.c |
179 | +++ b/src/basic/path-lookup.c | 180 | +++ b/src/basic/path-lookup.c |
180 | @@ -15,6 +15,7 @@ | 181 | @@ -15,6 +15,7 @@ |
@@ -186,7 +187,7 @@ index 52968dee34..2f4f7e3dcd 100644 | |||
186 | int xdg_user_runtime_dir(char **ret, const char *suffix) { | 187 | int xdg_user_runtime_dir(char **ret, const char *suffix) { |
187 | const char *e; | 188 | const char *e; |
188 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c | 189 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c |
189 | index ba47ca5812..8baf728fde 100644 | 190 | index 0b6fb137bd..e8e8c7b270 100644 |
190 | --- a/src/basic/proc-cmdline.c | 191 | --- a/src/basic/proc-cmdline.c |
191 | +++ b/src/basic/proc-cmdline.c | 192 | +++ b/src/basic/proc-cmdline.c |
192 | @@ -15,6 +15,7 @@ | 193 | @@ -15,6 +15,7 @@ |
@@ -198,7 +199,7 @@ index ba47ca5812..8baf728fde 100644 | |||
198 | int proc_cmdline(char **ret) { | 199 | int proc_cmdline(char **ret) { |
199 | const char *e; | 200 | const char *e; |
200 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | 201 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c |
201 | index 7aaf95bfce..da7e836f14 100644 | 202 | index ccab71f7d2..8f9eee8d36 100644 |
202 | --- a/src/basic/procfs-util.c | 203 | --- a/src/basic/procfs-util.c |
203 | +++ b/src/basic/procfs-util.c | 204 | +++ b/src/basic/procfs-util.c |
204 | @@ -11,6 +11,7 @@ | 205 | @@ -11,6 +11,7 @@ |
@@ -210,7 +211,7 @@ index 7aaf95bfce..da7e836f14 100644 | |||
210 | int procfs_tasks_get_limit(uint64_t *ret) { | 211 | int procfs_tasks_get_limit(uint64_t *ret) { |
211 | _cleanup_free_ char *value = NULL; | 212 | _cleanup_free_ char *value = NULL; |
212 | diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c | 213 | diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c |
213 | index c94ee26bd9..14e35b4653 100644 | 214 | index 4989f4f37c..ca00bf99d8 100644 |
214 | --- a/src/basic/selinux-util.c | 215 | --- a/src/basic/selinux-util.c |
215 | +++ b/src/basic/selinux-util.c | 216 | +++ b/src/basic/selinux-util.c |
216 | @@ -27,6 +27,7 @@ | 217 | @@ -27,6 +27,7 @@ |
@@ -222,10 +223,10 @@ index c94ee26bd9..14e35b4653 100644 | |||
222 | #if HAVE_SELINUX | 223 | #if HAVE_SELINUX |
223 | DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); | 224 | DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); |
224 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c | 225 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c |
225 | index 15cc1b8851..02bb3f01f9 100644 | 226 | index 5318d6378d..23c2f77675 100644 |
226 | --- a/src/basic/time-util.c | 227 | --- a/src/basic/time-util.c |
227 | +++ b/src/basic/time-util.c | 228 | +++ b/src/basic/time-util.c |
228 | @@ -26,6 +26,7 @@ | 229 | @@ -27,6 +27,7 @@ |
229 | #include "string-util.h" | 230 | #include "string-util.h" |
230 | #include "strv.h" | 231 | #include "strv.h" |
231 | #include "time-util.h" | 232 | #include "time-util.h" |
@@ -234,7 +235,7 @@ index 15cc1b8851..02bb3f01f9 100644 | |||
234 | static clockid_t map_clock_id(clockid_t c) { | 235 | static clockid_t map_clock_id(clockid_t c) { |
235 | 236 | ||
236 | diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c | 237 | diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c |
237 | index b96e1f927f..cba979baca 100644 | 238 | index cd34f88bb9..3a77b6f2ca 100644 |
238 | --- a/src/boot/bless-boot.c | 239 | --- a/src/boot/bless-boot.c |
239 | +++ b/src/boot/bless-boot.c | 240 | +++ b/src/boot/bless-boot.c |
240 | @@ -18,6 +18,7 @@ | 241 | @@ -18,6 +18,7 @@ |
@@ -246,10 +247,10 @@ index b96e1f927f..cba979baca 100644 | |||
246 | static char **arg_path = NULL; | 247 | static char **arg_path = NULL; |
247 | 248 | ||
248 | diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c | 249 | diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c |
249 | index b7d2e32639..fdbc1df95e 100644 | 250 | index 37c581fb22..e02789d689 100644 |
250 | --- a/src/core/dbus-cgroup.c | 251 | --- a/src/core/dbus-cgroup.c |
251 | +++ b/src/core/dbus-cgroup.c | 252 | +++ b/src/core/dbus-cgroup.c |
252 | @@ -15,6 +15,7 @@ | 253 | @@ -16,6 +16,7 @@ |
253 | #include "fileio.h" | 254 | #include "fileio.h" |
254 | #include "limits-util.h" | 255 | #include "limits-util.h" |
255 | #include "path-util.h" | 256 | #include "path-util.h" |
@@ -258,7 +259,7 @@ index b7d2e32639..fdbc1df95e 100644 | |||
258 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); | 259 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); |
259 | 260 | ||
260 | diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c | 261 | diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c |
261 | index 50f7ada8ce..5c760ee487 100644 | 262 | index abe009c395..0451e58d1c 100644 |
262 | --- a/src/core/dbus-execute.c | 263 | --- a/src/core/dbus-execute.c |
263 | +++ b/src/core/dbus-execute.c | 264 | +++ b/src/core/dbus-execute.c |
264 | @@ -41,6 +41,7 @@ | 265 | @@ -41,6 +41,7 @@ |
@@ -270,7 +271,7 @@ index 50f7ada8ce..5c760ee487 100644 | |||
270 | BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); | 271 | BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); |
271 | static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); | 272 | static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); |
272 | diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c | 273 | diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c |
273 | index 951450e53d..50d134e9a1 100644 | 274 | index d6223db305..3654c344ee 100644 |
274 | --- a/src/core/dbus-util.c | 275 | --- a/src/core/dbus-util.c |
275 | +++ b/src/core/dbus-util.c | 276 | +++ b/src/core/dbus-util.c |
276 | @@ -7,6 +7,7 @@ | 277 | @@ -7,6 +7,7 @@ |
@@ -282,10 +283,10 @@ index 951450e53d..50d134e9a1 100644 | |||
282 | int bus_property_get_triggered_unit( | 283 | int bus_property_get_triggered_unit( |
283 | sd_bus *bus, | 284 | sd_bus *bus, |
284 | diff --git a/src/core/execute.c b/src/core/execute.c | 285 | diff --git a/src/core/execute.c b/src/core/execute.c |
285 | index 2a4840a3a9..d3f1e0e0f8 100644 | 286 | index c992b8d5d3..89632e0582 100644 |
286 | --- a/src/core/execute.c | 287 | --- a/src/core/execute.c |
287 | +++ b/src/core/execute.c | 288 | +++ b/src/core/execute.c |
288 | @@ -89,6 +89,7 @@ | 289 | @@ -96,6 +96,7 @@ |
289 | #include "unit.h" | 290 | #include "unit.h" |
290 | #include "user-util.h" | 291 | #include "user-util.h" |
291 | #include "utmp-wtmp.h" | 292 | #include "utmp-wtmp.h" |
@@ -294,7 +295,7 @@ index 2a4840a3a9..d3f1e0e0f8 100644 | |||
294 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) | 295 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) |
295 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) | 296 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) |
296 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | 297 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c |
297 | index 09ccd613e3..f4e64fa283 100644 | 298 | index a56f12f47f..6b8729ef67 100644 |
298 | --- a/src/core/kmod-setup.c | 299 | --- a/src/core/kmod-setup.c |
299 | +++ b/src/core/kmod-setup.c | 300 | +++ b/src/core/kmod-setup.c |
300 | @@ -11,6 +11,7 @@ | 301 | @@ -11,6 +11,7 @@ |
@@ -306,7 +307,7 @@ index 09ccd613e3..f4e64fa283 100644 | |||
306 | #if HAVE_KMOD | 307 | #if HAVE_KMOD |
307 | #include "module-util.h" | 308 | #include "module-util.h" |
308 | diff --git a/src/core/service.c b/src/core/service.c | 309 | diff --git a/src/core/service.c b/src/core/service.c |
309 | index 00e61945ba..1ecab28354 100644 | 310 | index d7bdeb7cca..bfd483b2c0 100644 |
310 | --- a/src/core/service.c | 311 | --- a/src/core/service.c |
311 | +++ b/src/core/service.c | 312 | +++ b/src/core/service.c |
312 | @@ -41,6 +41,7 @@ | 313 | @@ -41,6 +41,7 @@ |
@@ -318,7 +319,7 @@ index 00e61945ba..1ecab28354 100644 | |||
318 | static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { | 319 | static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { |
319 | [SERVICE_DEAD] = UNIT_INACTIVE, | 320 | [SERVICE_DEAD] = UNIT_INACTIVE, |
320 | diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c | 321 | diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c |
321 | index 35885dfb47..bb9f0660a6 100644 | 322 | index 30c67ffe7c..595bc30726 100644 |
322 | --- a/src/coredump/coredump-vacuum.c | 323 | --- a/src/coredump/coredump-vacuum.c |
323 | +++ b/src/coredump/coredump-vacuum.c | 324 | +++ b/src/coredump/coredump-vacuum.c |
324 | @@ -16,6 +16,7 @@ | 325 | @@ -16,6 +16,7 @@ |
@@ -330,7 +331,7 @@ index 35885dfb47..bb9f0660a6 100644 | |||
330 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ | 331 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ |
331 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ | 332 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ |
332 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c | 333 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c |
333 | index 77dfdefd64..e21ecbeff8 100644 | 334 | index d2aa1815c2..a851aa203f 100644 |
334 | --- a/src/journal-remote/journal-remote-main.c | 335 | --- a/src/journal-remote/journal-remote-main.c |
335 | +++ b/src/journal-remote/journal-remote-main.c | 336 | +++ b/src/journal-remote/journal-remote-main.c |
336 | @@ -22,6 +22,7 @@ | 337 | @@ -22,6 +22,7 @@ |
@@ -342,10 +343,10 @@ index 77dfdefd64..e21ecbeff8 100644 | |||
342 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" | 343 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" |
343 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" | 344 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" |
344 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c | 345 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c |
345 | index 8d4897b942..15476b3c83 100644 | 346 | index bcf2e01d5c..5394d1dc01 100644 |
346 | --- a/src/journal/journalctl.c | 347 | --- a/src/journal/journalctl.c |
347 | +++ b/src/journal/journalctl.c | 348 | +++ b/src/journal/journalctl.c |
348 | @@ -69,6 +69,7 @@ | 349 | @@ -73,6 +73,7 @@ |
349 | #include "unit-name.h" | 350 | #include "unit-name.h" |
350 | #include "user-util.h" | 351 | #include "user-util.h" |
351 | #include "varlink.h" | 352 | #include "varlink.h" |
@@ -354,7 +355,7 @@ index 8d4897b942..15476b3c83 100644 | |||
354 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) | 355 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) |
355 | #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ | 356 | #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ |
356 | diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c | 357 | diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c |
357 | index 6fb0abb419..2d94d9938e 100644 | 358 | index cb1ab88ca5..7f35759540 100644 |
358 | --- a/src/journal/sd-journal.c | 359 | --- a/src/journal/sd-journal.c |
359 | +++ b/src/journal/sd-journal.c | 360 | +++ b/src/journal/sd-journal.c |
360 | @@ -40,6 +40,7 @@ | 361 | @@ -40,6 +40,7 @@ |
@@ -366,7 +367,7 @@ index 6fb0abb419..2d94d9938e 100644 | |||
366 | #define JOURNAL_FILES_MAX 7168 | 367 | #define JOURNAL_FILES_MAX 7168 |
367 | 368 | ||
368 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c | 369 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c |
369 | index 55e35cd902..0ed98f9224 100644 | 370 | index 86ff5bdfa2..3fd053a358 100644 |
370 | --- a/src/libsystemd/sd-bus/bus-message.c | 371 | --- a/src/libsystemd/sd-bus/bus-message.c |
371 | +++ b/src/libsystemd/sd-bus/bus-message.c | 372 | +++ b/src/libsystemd/sd-bus/bus-message.c |
372 | @@ -21,6 +21,7 @@ | 373 | @@ -21,6 +21,7 @@ |
@@ -378,7 +379,7 @@ index 55e35cd902..0ed98f9224 100644 | |||
378 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); | 379 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); |
379 | 380 | ||
380 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c | 381 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c |
381 | index 6abac8822c..c74c9cd7fa 100644 | 382 | index 275c4318a1..5ffee59d17 100644 |
382 | --- a/src/libsystemd/sd-bus/bus-objects.c | 383 | --- a/src/libsystemd/sd-bus/bus-objects.c |
383 | +++ b/src/libsystemd/sd-bus/bus-objects.c | 384 | +++ b/src/libsystemd/sd-bus/bus-objects.c |
384 | @@ -13,6 +13,7 @@ | 385 | @@ -13,6 +13,7 @@ |
@@ -390,7 +391,7 @@ index 6abac8822c..c74c9cd7fa 100644 | |||
390 | static int node_vtable_get_userdata( | 391 | static int node_vtable_get_userdata( |
391 | sd_bus *bus, | 392 | sd_bus *bus, |
392 | diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c | 393 | diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c |
393 | index fc7e8e844a..7af4dd2712 100644 | 394 | index 4881fd0d32..c865f1133b 100644 |
394 | --- a/src/libsystemd/sd-bus/bus-socket.c | 395 | --- a/src/libsystemd/sd-bus/bus-socket.c |
395 | +++ b/src/libsystemd/sd-bus/bus-socket.c | 396 | +++ b/src/libsystemd/sd-bus/bus-socket.c |
396 | @@ -28,6 +28,7 @@ | 397 | @@ -28,6 +28,7 @@ |
@@ -402,7 +403,7 @@ index fc7e8e844a..7af4dd2712 100644 | |||
402 | #define SNDBUF_SIZE (8*1024*1024) | 403 | #define SNDBUF_SIZE (8*1024*1024) |
403 | 404 | ||
404 | diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c | 405 | diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c |
405 | index 9de5e454a6..fe86c93c63 100644 | 406 | index b8d4dc8d95..a8bac2665d 100644 |
406 | --- a/src/libsystemd/sd-bus/sd-bus.c | 407 | --- a/src/libsystemd/sd-bus/sd-bus.c |
407 | +++ b/src/libsystemd/sd-bus/sd-bus.c | 408 | +++ b/src/libsystemd/sd-bus/sd-bus.c |
408 | @@ -41,6 +41,7 @@ | 409 | @@ -41,6 +41,7 @@ |
@@ -414,7 +415,7 @@ index 9de5e454a6..fe86c93c63 100644 | |||
414 | #define log_debug_bus_message(m) \ | 415 | #define log_debug_bus_message(m) \ |
415 | do { \ | 416 | do { \ |
416 | diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c | 417 | diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c |
417 | index 8de0a859ee..58044b6ba9 100644 | 418 | index 8c6711797a..fac178823a 100644 |
418 | --- a/src/libsystemd/sd-bus/test-bus-benchmark.c | 419 | --- a/src/libsystemd/sd-bus/test-bus-benchmark.c |
419 | +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c | 420 | +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c |
420 | @@ -14,6 +14,7 @@ | 421 | @@ -14,6 +14,7 @@ |
@@ -426,7 +427,7 @@ index 8de0a859ee..58044b6ba9 100644 | |||
426 | #define MAX_SIZE (2*1024*1024) | 427 | #define MAX_SIZE (2*1024*1024) |
427 | 428 | ||
428 | diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c | 429 | diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c |
429 | index 233d081300..40a32b9700 100644 | 430 | index cb8153f4fe..d52a56019d 100644 |
430 | --- a/src/locale/keymap-util.c | 431 | --- a/src/locale/keymap-util.c |
431 | +++ b/src/locale/keymap-util.c | 432 | +++ b/src/locale/keymap-util.c |
432 | @@ -21,6 +21,7 @@ | 433 | @@ -21,6 +21,7 @@ |
@@ -438,7 +439,7 @@ index 233d081300..40a32b9700 100644 | |||
438 | static bool startswith_comma(const char *s, const char *prefix) { | 439 | static bool startswith_comma(const char *s, const char *prefix) { |
439 | s = startswith(s, prefix); | 440 | s = startswith(s, prefix); |
440 | diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c | 441 | diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c |
441 | index 16f4289585..6c5e438b36 100644 | 442 | index 8e7a94db55..b5c368c6d1 100644 |
442 | --- a/src/login/pam_systemd.c | 443 | --- a/src/login/pam_systemd.c |
443 | +++ b/src/login/pam_systemd.c | 444 | +++ b/src/login/pam_systemd.c |
444 | @@ -31,6 +31,7 @@ | 445 | @@ -31,6 +31,7 @@ |
@@ -450,7 +451,7 @@ index 16f4289585..6c5e438b36 100644 | |||
450 | #include "parse-util.h" | 451 | #include "parse-util.h" |
451 | #include "path-util.h" | 452 | #include "path-util.h" |
452 | diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c | 453 | diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c |
453 | index bed1e42697..e4847c2bee 100644 | 454 | index 2fa21a067a..2e9995aa62 100644 |
454 | --- a/src/network/generator/network-generator.c | 455 | --- a/src/network/generator/network-generator.c |
455 | +++ b/src/network/generator/network-generator.c | 456 | +++ b/src/network/generator/network-generator.c |
456 | @@ -13,6 +13,7 @@ | 457 | @@ -13,6 +13,7 @@ |
@@ -462,7 +463,7 @@ index bed1e42697..e4847c2bee 100644 | |||
462 | /* | 463 | /* |
463 | # .network | 464 | # .network |
464 | diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c | 465 | diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c |
465 | index d341fa25aa..91646bc2c2 100644 | 466 | index 92bb5120ab..eeca905c75 100644 |
466 | --- a/src/nspawn/nspawn-settings.c | 467 | --- a/src/nspawn/nspawn-settings.c |
467 | +++ b/src/nspawn/nspawn-settings.c | 468 | +++ b/src/nspawn/nspawn-settings.c |
468 | @@ -16,6 +16,7 @@ | 469 | @@ -16,6 +16,7 @@ |
@@ -474,7 +475,7 @@ index d341fa25aa..91646bc2c2 100644 | |||
474 | Settings *settings_new(void) { | 475 | Settings *settings_new(void) { |
475 | Settings *s; | 476 | Settings *s; |
476 | diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c | 477 | diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c |
477 | index 5db0dcef76..681f8677e4 100644 | 478 | index 53f0492116..c71941fdd7 100644 |
478 | --- a/src/nss-mymachines/nss-mymachines.c | 479 | --- a/src/nss-mymachines/nss-mymachines.c |
479 | +++ b/src/nss-mymachines/nss-mymachines.c | 480 | +++ b/src/nss-mymachines/nss-mymachines.c |
480 | @@ -19,6 +19,7 @@ | 481 | @@ -19,6 +19,7 @@ |
@@ -486,7 +487,7 @@ index 5db0dcef76..681f8677e4 100644 | |||
486 | NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); | 487 | NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); |
487 | NSS_GETPW_PROTOTYPES(mymachines); | 488 | NSS_GETPW_PROTOTYPES(mymachines); |
488 | diff --git a/src/portable/portable.c b/src/portable/portable.c | 489 | diff --git a/src/portable/portable.c b/src/portable/portable.c |
489 | index 3a1367ec2b..f29336cb1e 100644 | 490 | index ed7eac0291..78986977f8 100644 |
490 | --- a/src/portable/portable.c | 491 | --- a/src/portable/portable.c |
491 | +++ b/src/portable/portable.c | 492 | +++ b/src/portable/portable.c |
492 | @@ -31,6 +31,7 @@ | 493 | @@ -31,6 +31,7 @@ |
@@ -498,31 +499,31 @@ index 3a1367ec2b..f29336cb1e 100644 | |||
498 | static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); | 499 | static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); |
499 | 500 | ||
500 | diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c | 501 | diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c |
501 | index 3072b984e5..c46ae374bf 100644 | 502 | index b479335769..212d0bed20 100644 |
502 | --- a/src/resolve/resolvectl.c | 503 | --- a/src/resolve/resolvectl.c |
503 | +++ b/src/resolve/resolvectl.c | 504 | +++ b/src/resolve/resolvectl.c |
504 | @@ -36,6 +36,7 @@ | 505 | @@ -37,6 +37,7 @@ |
505 | #include "strv.h" | ||
506 | #include "terminal-util.h" | 506 | #include "terminal-util.h" |
507 | #include "utf8.h" | ||
507 | #include "verbs.h" | 508 | #include "verbs.h" |
508 | +#include "missing_stdlib.h" | 509 | +#include "missing_stdlib.h" |
509 | 510 | ||
510 | static int arg_family = AF_UNSPEC; | 511 | static int arg_family = AF_UNSPEC; |
511 | static int arg_ifindex = 0; | 512 | static int arg_ifindex = 0; |
512 | diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c | 513 | diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c |
513 | index 8ad4694046..da5082c02a 100644 | 514 | index 32f68d5e6a..bda1e1ef4f 100644 |
514 | --- a/src/shared/bus-get-properties.c | 515 | --- a/src/shared/bus-get-properties.c |
515 | +++ b/src/shared/bus-get-properties.c | 516 | +++ b/src/shared/bus-get-properties.c |
516 | @@ -3,6 +3,7 @@ | 517 | @@ -4,6 +4,7 @@ |
517 | #include "bus-get-properties.h" | ||
518 | #include "rlimit-util.h" | 518 | #include "rlimit-util.h" |
519 | #include "stdio-util.h" | ||
519 | #include "string-util.h" | 520 | #include "string-util.h" |
520 | +#include "missing_stdlib.h" | 521 | +#include "missing_stdlib.h" |
521 | 522 | ||
522 | int bus_property_get_bool( | 523 | int bus_property_get_bool( |
523 | sd_bus *bus, | 524 | sd_bus *bus, |
524 | diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c | 525 | diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c |
525 | index b21fe39326..af2640005c 100644 | 526 | index 3e97be9671..2b8ca838f7 100644 |
526 | --- a/src/shared/bus-unit-procs.c | 527 | --- a/src/shared/bus-unit-procs.c |
527 | +++ b/src/shared/bus-unit-procs.c | 528 | +++ b/src/shared/bus-unit-procs.c |
528 | @@ -10,6 +10,7 @@ | 529 | @@ -10,6 +10,7 @@ |
@@ -534,10 +535,10 @@ index b21fe39326..af2640005c 100644 | |||
534 | struct CGroupInfo { | 535 | struct CGroupInfo { |
535 | char *cgroup_path; | 536 | char *cgroup_path; |
536 | diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c | 537 | diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c |
537 | index f2652ed9a5..eb019fc89f 100644 | 538 | index 2bab2299fb..62afdc7973 100644 |
538 | --- a/src/shared/bus-unit-util.c | 539 | --- a/src/shared/bus-unit-util.c |
539 | +++ b/src/shared/bus-unit-util.c | 540 | +++ b/src/shared/bus-unit-util.c |
540 | @@ -39,6 +39,7 @@ | 541 | @@ -44,6 +44,7 @@ |
541 | #include "unit-def.h" | 542 | #include "unit-def.h" |
542 | #include "user-util.h" | 543 | #include "user-util.h" |
543 | #include "utf8.h" | 544 | #include "utf8.h" |
@@ -546,22 +547,22 @@ index f2652ed9a5..eb019fc89f 100644 | |||
546 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { | 547 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { |
547 | assert(message); | 548 | assert(message); |
548 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c | 549 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c |
549 | index 77c1c62182..5cd31f3c15 100644 | 550 | index fbda218b3b..aae0be75c6 100644 |
550 | --- a/src/shared/bus-util.c | 551 | --- a/src/shared/bus-util.c |
551 | +++ b/src/shared/bus-util.c | 552 | +++ b/src/shared/bus-util.c |
552 | @@ -22,6 +22,7 @@ | 553 | @@ -21,6 +21,7 @@ |
554 | #include "path-util.h" | ||
553 | #include "socket-util.h" | 555 | #include "socket-util.h" |
554 | #include "stdio-util.h" | 556 | #include "stdio-util.h" |
555 | /* #include "string-util.h" */ | ||
556 | +#include "missing_stdlib.h" | 557 | +#include "missing_stdlib.h" |
557 | 558 | ||
558 | static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { | 559 | static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { |
559 | sd_event *e = userdata; | 560 | sd_event *e = userdata; |
560 | diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c | 561 | diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c |
561 | index b812665315..8e68f7f8fc 100644 | 562 | index 8bd1e3a6ac..f8d6eab9bd 100644 |
562 | --- a/src/shared/dns-domain.c | 563 | --- a/src/shared/dns-domain.c |
563 | +++ b/src/shared/dns-domain.c | 564 | +++ b/src/shared/dns-domain.c |
564 | @@ -23,6 +23,7 @@ | 565 | @@ -17,6 +17,7 @@ |
565 | #include "string-util.h" | 566 | #include "string-util.h" |
566 | #include "strv.h" | 567 | #include "strv.h" |
567 | #include "utf8.h" | 568 | #include "utf8.h" |
@@ -570,7 +571,7 @@ index b812665315..8e68f7f8fc 100644 | |||
570 | int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { | 571 | int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { |
571 | const char *n; | 572 | const char *n; |
572 | diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c | 573 | diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c |
573 | index 7c4fc7021d..3fbaf5a639 100644 | 574 | index e95b638f4d..a1bf15baa8 100644 |
574 | --- a/src/shared/journal-importer.c | 575 | --- a/src/shared/journal-importer.c |
575 | +++ b/src/shared/journal-importer.c | 576 | +++ b/src/shared/journal-importer.c |
576 | @@ -14,6 +14,7 @@ | 577 | @@ -14,6 +14,7 @@ |
@@ -582,7 +583,7 @@ index 7c4fc7021d..3fbaf5a639 100644 | |||
582 | enum { | 583 | enum { |
583 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ | 584 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ |
584 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c | 585 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c |
585 | index 899e894ab7..628854ac9c 100644 | 586 | index bf574d32a5..a09c79d2fb 100644 |
586 | --- a/src/shared/logs-show.c | 587 | --- a/src/shared/logs-show.c |
587 | +++ b/src/shared/logs-show.c | 588 | +++ b/src/shared/logs-show.c |
588 | @@ -41,6 +41,7 @@ | 589 | @@ -41,6 +41,7 @@ |
@@ -594,10 +595,10 @@ index 899e894ab7..628854ac9c 100644 | |||
594 | /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ | 595 | /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ |
595 | #define PRINT_LINE_THRESHOLD 3 | 596 | #define PRINT_LINE_THRESHOLD 3 |
596 | diff --git a/src/shared/pager.c b/src/shared/pager.c | 597 | diff --git a/src/shared/pager.c b/src/shared/pager.c |
597 | index e03be6d23b..50e3d1f75c 100644 | 598 | index f689d9f28f..aae3957c2f 100644 |
598 | --- a/src/shared/pager.c | 599 | --- a/src/shared/pager.c |
599 | +++ b/src/shared/pager.c | 600 | +++ b/src/shared/pager.c |
600 | @@ -23,6 +23,7 @@ | 601 | @@ -26,6 +26,7 @@ |
601 | #include "strv.h" | 602 | #include "strv.h" |
602 | #include "terminal-util.h" | 603 | #include "terminal-util.h" |
603 | #include "util.h" | 604 | #include "util.h" |
@@ -606,7 +607,7 @@ index e03be6d23b..50e3d1f75c 100644 | |||
606 | static pid_t pager_pid = 0; | 607 | static pid_t pager_pid = 0; |
607 | 608 | ||
608 | diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c | 609 | diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c |
609 | index 7cb7d8a477..8e7d7f9e7c 100644 | 610 | index 5d5bf7f21d..f1002ffa6c 100644 |
610 | --- a/src/shared/uid-range.c | 611 | --- a/src/shared/uid-range.c |
611 | +++ b/src/shared/uid-range.c | 612 | +++ b/src/shared/uid-range.c |
612 | @@ -9,6 +9,7 @@ | 613 | @@ -9,6 +9,7 @@ |
@@ -618,7 +619,7 @@ index 7cb7d8a477..8e7d7f9e7c 100644 | |||
618 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { | 619 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { |
619 | assert(range); | 620 | assert(range); |
620 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c | 621 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c |
621 | index b461aead60..9941695ed9 100644 | 622 | index 4391d9f1f5..9b73cd0aeb 100644 |
622 | --- a/src/socket-proxy/socket-proxyd.c | 623 | --- a/src/socket-proxy/socket-proxyd.c |
623 | +++ b/src/socket-proxy/socket-proxyd.c | 624 | +++ b/src/socket-proxy/socket-proxyd.c |
624 | @@ -26,6 +26,7 @@ | 625 | @@ -26,6 +26,7 @@ |
@@ -630,7 +631,7 @@ index b461aead60..9941695ed9 100644 | |||
630 | #define BUFFER_SIZE (256 * 1024) | 631 | #define BUFFER_SIZE (256 * 1024) |
631 | 632 | ||
632 | diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c | 633 | diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c |
633 | index 52217429b1..70708dedf3 100644 | 634 | index f0f9679769..128fc164da 100644 |
634 | --- a/src/test/test-hexdecoct.c | 635 | --- a/src/test/test-hexdecoct.c |
635 | +++ b/src/test/test-hexdecoct.c | 636 | +++ b/src/test/test-hexdecoct.c |
636 | @@ -6,6 +6,7 @@ | 637 | @@ -6,6 +6,7 @@ |
@@ -642,7 +643,7 @@ index 52217429b1..70708dedf3 100644 | |||
642 | static void test_hexchar(void) { | 643 | static void test_hexchar(void) { |
643 | assert_se(hexchar(0xa) == 'a'); | 644 | assert_se(hexchar(0xa) == 'a'); |
644 | diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c | 645 | diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c |
645 | index 6c020ac0ed..10723ec46c 100644 | 646 | index 0da59e2c75..66da3741ee 100644 |
646 | --- a/src/udev/udev-builtin-path_id.c | 647 | --- a/src/udev/udev-builtin-path_id.c |
647 | +++ b/src/udev/udev-builtin-path_id.c | 648 | +++ b/src/udev/udev-builtin-path_id.c |
648 | @@ -22,6 +22,7 @@ | 649 | @@ -22,6 +22,7 @@ |
@@ -654,7 +655,7 @@ index 6c020ac0ed..10723ec46c 100644 | |||
654 | _printf_(2,3) | 655 | _printf_(2,3) |
655 | static void path_prepend(char **path, const char *fmt, ...) { | 656 | static void path_prepend(char **path, const char *fmt, ...) { |
656 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c | 657 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c |
657 | index e1c2baf7f2..62d4086802 100644 | 658 | index 5159d19a38..0ed5b65844 100644 |
658 | --- a/src/udev/udev-event.c | 659 | --- a/src/udev/udev-event.c |
659 | +++ b/src/udev/udev-event.c | 660 | +++ b/src/udev/udev-event.c |
660 | @@ -34,6 +34,7 @@ | 661 | @@ -34,6 +34,7 @@ |
@@ -666,7 +667,7 @@ index e1c2baf7f2..62d4086802 100644 | |||
666 | typedef struct Spawn { | 667 | typedef struct Spawn { |
667 | sd_device *device; | 668 | sd_device *device; |
668 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | 669 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c |
669 | index c36f032f66..36970813d8 100644 | 670 | index ef6a0c112c..422fc19127 100644 |
670 | --- a/src/udev/udev-rules.c | 671 | --- a/src/udev/udev-rules.c |
671 | +++ b/src/udev/udev-rules.c | 672 | +++ b/src/udev/udev-rules.c |
672 | @@ -30,6 +30,7 @@ | 673 | @@ -30,6 +30,7 @@ |
@@ -677,3 +678,6 @@ index c36f032f66..36970813d8 100644 | |||
677 | 678 | ||
678 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") | 679 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") |
679 | 680 | ||
681 | -- | ||
682 | 2.27.0 | ||
683 | |||