diff options
Diffstat (limited to 'poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch')
-rw-r--r-- | poky/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/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index 8e7a2fb6e4..154e57b540 100644 --- a/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch @@ -1,7 +1,7 @@ -From 7e771de87cf728a8678f1f28f391bba3589e2496 Mon Sep 17 00:00:00 2001 +From 5aeae0ea89f5af74ed5d95bed1d87a03b3801ff0 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 14:18:21 +0800 -Subject: [PATCH] src/basic/missing.h: check for missing strndupa +Subject: [PATCH 05/26] src/basic/missing.h: check for missing strndupa include missing.h for definition of strndupa @@ -15,7 +15,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> [rebased for systemd 244] - +[Rebased for v247] +Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> --- meson.build | 1 + src/backlight/backlight.c | 1 + @@ -70,31 +71,31 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> 50 files changed, 61 insertions(+) diff --git a/meson.build b/meson.build -index 9187439bdd..bea9935a91 100644 +index 6aa47fc755..0d0fa4963c 100644 --- a/meson.build +++ b/meson.build -@@ -527,6 +527,7 @@ foreach ident : [ - #include <unistd.h> - #include <signal.h> +@@ -535,6 +535,7 @@ foreach ident : [ #include <sys/wait.h>'''], + ['mallinfo', '''#include <malloc.h>'''], + ['close_range', '''#include <unistd.h>'''], + ['strndupa' , '''#include <string.h>'''], ] have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c -index 3a644363e1..73946a829b 100644 +index d1b6a81e33..38b7008371 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c -@@ -17,6 +17,7 @@ +@@ -19,6 +19,7 @@ #include "string-util.h" #include "strv.h" #include "util.h" +#include "missing_stdlib.h" - static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { - const char *subsystem, *sysname, *value; + static int help(void) { + _cleanup_free_ char *link = NULL; diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index e94fcfad02..856a7068b0 100644 +index f28bf1866a..bb960f183c 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -38,6 +38,7 @@ @@ -106,7 +107,7 @@ index e94fcfad02..856a7068b0 100644 static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { _cleanup_free_ char *fs = NULL; diff --git a/src/basic/env-util.c b/src/basic/env-util.c -index b8dc98915f..5049b37594 100644 +index a84863ff22..d4f5d57231 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -15,6 +15,7 @@ @@ -115,13 +116,13 @@ index b8dc98915f..5049b37594 100644 #include "utf8.h" +#include "missing_stdlib.h" - #define VALID_CHARS_ENV_NAME \ - DIGITS LETTERS \ + /* We follow bash for the character set. Different shells have different rules. */ + #define VALID_BASH_ENV_NAME_CHARS \ diff --git a/src/basic/log.c b/src/basic/log.c -index c6fe203808..b7ef932d28 100644 +index d4054cf46a..b608863e45 100644 --- a/src/basic/log.c +++ b/src/basic/log.c -@@ -35,6 +35,7 @@ +@@ -36,6 +36,7 @@ #include "terminal-util.h" #include "time-util.h" #include "utf8.h" @@ -130,7 +131,7 @@ index c6fe203808..b7ef932d28 100644 #define SNDBUF_SIZE (8*1024*1024) diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h -index 188a8d4406..1e16ec287a 100644 +index 8c76f93eb2..9068bfb4f0 100644 --- a/src/basic/missing_stdlib.h +++ b/src/basic/missing_stdlib.h @@ -11,3 +11,15 @@ @@ -150,10 +151,10 @@ index 188a8d4406..1e16ec287a 100644 + }) +#endif diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c -index 6ebc2b95fd..88f4359bab 100644 +index f91f8f7a08..fb31596216 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c -@@ -13,6 +13,7 @@ +@@ -14,6 +14,7 @@ #include "stat-util.h" #include "stdio-util.h" #include "user-util.h" @@ -162,10 +163,10 @@ index 6ebc2b95fd..88f4359bab 100644 int mkdir_safe_internal( const char *path, diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 44f0438cf4..54b4133343 100644 +index 5d4dafe3a5..70749750d4 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c -@@ -19,6 +19,7 @@ +@@ -22,6 +22,7 @@ #include "stat-util.h" #include "string-util.h" #include "strv.h" @@ -174,7 +175,7 @@ index 44f0438cf4..54b4133343 100644 int parse_boolean(const char *v) { if (!v) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 52968dee34..2f4f7e3dcd 100644 +index 96b82170d0..71342b46af 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c @@ -15,6 +15,7 @@ @@ -186,7 +187,7 @@ index 52968dee34..2f4f7e3dcd 100644 int xdg_user_runtime_dir(char **ret, const char *suffix) { const char *e; diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c -index ba47ca5812..8baf728fde 100644 +index 0b6fb137bd..e8e8c7b270 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -15,6 +15,7 @@ @@ -198,7 +199,7 @@ index ba47ca5812..8baf728fde 100644 int proc_cmdline(char **ret) { const char *e; diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 7aaf95bfce..da7e836f14 100644 +index ccab71f7d2..8f9eee8d36 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -11,6 +11,7 @@ @@ -210,7 +211,7 @@ index 7aaf95bfce..da7e836f14 100644 int procfs_tasks_get_limit(uint64_t *ret) { _cleanup_free_ char *value = NULL; diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c -index c94ee26bd9..14e35b4653 100644 +index 4989f4f37c..ca00bf99d8 100644 --- a/src/basic/selinux-util.c +++ b/src/basic/selinux-util.c @@ -27,6 +27,7 @@ @@ -222,10 +223,10 @@ index c94ee26bd9..14e35b4653 100644 #if HAVE_SELINUX DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 15cc1b8851..02bb3f01f9 100644 +index 5318d6378d..23c2f77675 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -26,6 +26,7 @@ +@@ -27,6 +27,7 @@ #include "string-util.h" #include "strv.h" #include "time-util.h" @@ -234,7 +235,7 @@ index 15cc1b8851..02bb3f01f9 100644 static clockid_t map_clock_id(clockid_t c) { diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c -index b96e1f927f..cba979baca 100644 +index cd34f88bb9..3a77b6f2ca 100644 --- a/src/boot/bless-boot.c +++ b/src/boot/bless-boot.c @@ -18,6 +18,7 @@ @@ -246,10 +247,10 @@ index b96e1f927f..cba979baca 100644 static char **arg_path = NULL; diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index b7d2e32639..fdbc1df95e 100644 +index 37c581fb22..e02789d689 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c -@@ -15,6 +15,7 @@ +@@ -16,6 +16,7 @@ #include "fileio.h" #include "limits-util.h" #include "path-util.h" @@ -258,7 +259,7 @@ index b7d2e32639..fdbc1df95e 100644 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c -index 50f7ada8ce..5c760ee487 100644 +index abe009c395..0451e58d1c 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -41,6 +41,7 @@ @@ -270,7 +271,7 @@ index 50f7ada8ce..5c760ee487 100644 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c -index 951450e53d..50d134e9a1 100644 +index d6223db305..3654c344ee 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -7,6 +7,7 @@ @@ -282,10 +283,10 @@ index 951450e53d..50d134e9a1 100644 int bus_property_get_triggered_unit( sd_bus *bus, diff --git a/src/core/execute.c b/src/core/execute.c -index 2a4840a3a9..d3f1e0e0f8 100644 +index c992b8d5d3..89632e0582 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -89,6 +89,7 @@ +@@ -96,6 +96,7 @@ #include "unit.h" #include "user-util.h" #include "utmp-wtmp.h" @@ -294,7 +295,7 @@ index 2a4840a3a9..d3f1e0e0f8 100644 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index 09ccd613e3..f4e64fa283 100644 +index a56f12f47f..6b8729ef67 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -11,6 +11,7 @@ @@ -306,7 +307,7 @@ index 09ccd613e3..f4e64fa283 100644 #if HAVE_KMOD #include "module-util.h" diff --git a/src/core/service.c b/src/core/service.c -index 00e61945ba..1ecab28354 100644 +index d7bdeb7cca..bfd483b2c0 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -41,6 +41,7 @@ @@ -318,7 +319,7 @@ index 00e61945ba..1ecab28354 100644 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c -index 35885dfb47..bb9f0660a6 100644 +index 30c67ffe7c..595bc30726 100644 --- a/src/coredump/coredump-vacuum.c +++ b/src/coredump/coredump-vacuum.c @@ -16,6 +16,7 @@ @@ -330,7 +331,7 @@ index 35885dfb47..bb9f0660a6 100644 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c -index 77dfdefd64..e21ecbeff8 100644 +index d2aa1815c2..a851aa203f 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -22,6 +22,7 @@ @@ -342,10 +343,10 @@ index 77dfdefd64..e21ecbeff8 100644 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 8d4897b942..15476b3c83 100644 +index bcf2e01d5c..5394d1dc01 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c -@@ -69,6 +69,7 @@ +@@ -73,6 +73,7 @@ #include "unit-name.h" #include "user-util.h" #include "varlink.h" @@ -354,7 +355,7 @@ index 8d4897b942..15476b3c83 100644 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c -index 6fb0abb419..2d94d9938e 100644 +index cb1ab88ca5..7f35759540 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -40,6 +40,7 @@ @@ -366,7 +367,7 @@ index 6fb0abb419..2d94d9938e 100644 #define JOURNAL_FILES_MAX 7168 diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c -index 55e35cd902..0ed98f9224 100644 +index 86ff5bdfa2..3fd053a358 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -21,6 +21,7 @@ @@ -378,7 +379,7 @@ index 55e35cd902..0ed98f9224 100644 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c -index 6abac8822c..c74c9cd7fa 100644 +index 275c4318a1..5ffee59d17 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -13,6 +13,7 @@ @@ -390,7 +391,7 @@ index 6abac8822c..c74c9cd7fa 100644 static int node_vtable_get_userdata( sd_bus *bus, diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c -index fc7e8e844a..7af4dd2712 100644 +index 4881fd0d32..c865f1133b 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -28,6 +28,7 @@ @@ -402,7 +403,7 @@ index fc7e8e844a..7af4dd2712 100644 #define SNDBUF_SIZE (8*1024*1024) diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c -index 9de5e454a6..fe86c93c63 100644 +index b8d4dc8d95..a8bac2665d 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -41,6 +41,7 @@ @@ -414,7 +415,7 @@ index 9de5e454a6..fe86c93c63 100644 #define log_debug_bus_message(m) \ do { \ diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c -index 8de0a859ee..58044b6ba9 100644 +index 8c6711797a..fac178823a 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -14,6 +14,7 @@ @@ -426,7 +427,7 @@ index 8de0a859ee..58044b6ba9 100644 #define MAX_SIZE (2*1024*1024) diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c -index 233d081300..40a32b9700 100644 +index cb8153f4fe..d52a56019d 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c @@ -21,6 +21,7 @@ @@ -438,7 +439,7 @@ index 233d081300..40a32b9700 100644 static bool startswith_comma(const char *s, const char *prefix) { s = startswith(s, prefix); diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c -index 16f4289585..6c5e438b36 100644 +index 8e7a94db55..b5c368c6d1 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -31,6 +31,7 @@ @@ -450,7 +451,7 @@ index 16f4289585..6c5e438b36 100644 #include "parse-util.h" #include "path-util.h" diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c -index bed1e42697..e4847c2bee 100644 +index 2fa21a067a..2e9995aa62 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -13,6 +13,7 @@ @@ -462,7 +463,7 @@ index bed1e42697..e4847c2bee 100644 /* # .network diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c -index d341fa25aa..91646bc2c2 100644 +index 92bb5120ab..eeca905c75 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -16,6 +16,7 @@ @@ -474,7 +475,7 @@ index d341fa25aa..91646bc2c2 100644 Settings *settings_new(void) { Settings *s; diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c -index 5db0dcef76..681f8677e4 100644 +index 53f0492116..c71941fdd7 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -19,6 +19,7 @@ @@ -486,7 +487,7 @@ index 5db0dcef76..681f8677e4 100644 NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); NSS_GETPW_PROTOTYPES(mymachines); diff --git a/src/portable/portable.c b/src/portable/portable.c -index 3a1367ec2b..f29336cb1e 100644 +index ed7eac0291..78986977f8 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -31,6 +31,7 @@ @@ -498,31 +499,31 @@ index 3a1367ec2b..f29336cb1e 100644 static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c -index 3072b984e5..c46ae374bf 100644 +index b479335769..212d0bed20 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c -@@ -36,6 +36,7 @@ - #include "strv.h" +@@ -37,6 +37,7 @@ #include "terminal-util.h" + #include "utf8.h" #include "verbs.h" +#include "missing_stdlib.h" static int arg_family = AF_UNSPEC; static int arg_ifindex = 0; diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c -index 8ad4694046..da5082c02a 100644 +index 32f68d5e6a..bda1e1ef4f 100644 --- a/src/shared/bus-get-properties.c +++ b/src/shared/bus-get-properties.c -@@ -3,6 +3,7 @@ - #include "bus-get-properties.h" +@@ -4,6 +4,7 @@ #include "rlimit-util.h" + #include "stdio-util.h" #include "string-util.h" +#include "missing_stdlib.h" int bus_property_get_bool( sd_bus *bus, diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c -index b21fe39326..af2640005c 100644 +index 3e97be9671..2b8ca838f7 100644 --- a/src/shared/bus-unit-procs.c +++ b/src/shared/bus-unit-procs.c @@ -10,6 +10,7 @@ @@ -534,10 +535,10 @@ index b21fe39326..af2640005c 100644 struct CGroupInfo { char *cgroup_path; diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c -index f2652ed9a5..eb019fc89f 100644 +index 2bab2299fb..62afdc7973 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c -@@ -39,6 +39,7 @@ +@@ -44,6 +44,7 @@ #include "unit-def.h" #include "user-util.h" #include "utf8.h" @@ -546,22 +547,22 @@ index f2652ed9a5..eb019fc89f 100644 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { assert(message); diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c -index 77c1c62182..5cd31f3c15 100644 +index fbda218b3b..aae0be75c6 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c -@@ -22,6 +22,7 @@ +@@ -21,6 +21,7 @@ + #include "path-util.h" #include "socket-util.h" #include "stdio-util.h" - /* #include "string-util.h" */ +#include "missing_stdlib.h" static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { sd_event *e = userdata; diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c -index b812665315..8e68f7f8fc 100644 +index 8bd1e3a6ac..f8d6eab9bd 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c -@@ -23,6 +23,7 @@ +@@ -17,6 +17,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" @@ -570,7 +571,7 @@ index b812665315..8e68f7f8fc 100644 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { const char *n; diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c -index 7c4fc7021d..3fbaf5a639 100644 +index e95b638f4d..a1bf15baa8 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -14,6 +14,7 @@ @@ -582,7 +583,7 @@ index 7c4fc7021d..3fbaf5a639 100644 enum { IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index 899e894ab7..628854ac9c 100644 +index bf574d32a5..a09c79d2fb 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -41,6 +41,7 @@ @@ -594,10 +595,10 @@ index 899e894ab7..628854ac9c 100644 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ #define PRINT_LINE_THRESHOLD 3 diff --git a/src/shared/pager.c b/src/shared/pager.c -index e03be6d23b..50e3d1f75c 100644 +index f689d9f28f..aae3957c2f 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c -@@ -23,6 +23,7 @@ +@@ -26,6 +26,7 @@ #include "strv.h" #include "terminal-util.h" #include "util.h" @@ -606,7 +607,7 @@ index e03be6d23b..50e3d1f75c 100644 static pid_t pager_pid = 0; diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c -index 7cb7d8a477..8e7d7f9e7c 100644 +index 5d5bf7f21d..f1002ffa6c 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.c @@ -9,6 +9,7 @@ @@ -618,7 +619,7 @@ index 7cb7d8a477..8e7d7f9e7c 100644 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { assert(range); diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c -index b461aead60..9941695ed9 100644 +index 4391d9f1f5..9b73cd0aeb 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -26,6 +26,7 @@ @@ -630,7 +631,7 @@ index b461aead60..9941695ed9 100644 #define BUFFER_SIZE (256 * 1024) diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c -index 52217429b1..70708dedf3 100644 +index f0f9679769..128fc164da 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -6,6 +6,7 @@ @@ -642,7 +643,7 @@ index 52217429b1..70708dedf3 100644 static void test_hexchar(void) { assert_se(hexchar(0xa) == 'a'); diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index 6c020ac0ed..10723ec46c 100644 +index 0da59e2c75..66da3741ee 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -22,6 +22,7 @@ @@ -654,7 +655,7 @@ index 6c020ac0ed..10723ec46c 100644 _printf_(2,3) static void path_prepend(char **path, const char *fmt, ...) { diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index e1c2baf7f2..62d4086802 100644 +index 5159d19a38..0ed5b65844 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -34,6 +34,7 @@ @@ -666,7 +667,7 @@ index e1c2baf7f2..62d4086802 100644 typedef struct Spawn { sd_device *device; diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index c36f032f66..36970813d8 100644 +index ef6a0c112c..422fc19127 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -30,6 +30,7 @@ @@ -677,3 +678,6 @@ index c36f032f66..36970813d8 100644 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") +-- +2.27.0 + |