diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch index a5e41bfabf..30fe9a14df 100644 --- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch | |||
@@ -17,13 +17,13 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | |||
17 | src/shared/format-table.c | 36 ++++++++++++++++++++---------- | 17 | src/shared/format-table.c | 36 ++++++++++++++++++++---------- |
18 | 3 files changed, 38 insertions(+), 31 deletions(-) | 18 | 3 files changed, 38 insertions(+), 31 deletions(-) |
19 | 19 | ||
20 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h | 20 | Index: systemd-stable/src/basic/sort-util.h |
21 | index e029f8646eb0..27d68b341cf3 100644 | 21 | =================================================================== |
22 | --- a/src/basic/sort-util.h | 22 | --- systemd-stable.orig/src/basic/sort-util.h |
23 | +++ b/src/basic/sort-util.h | 23 | +++ systemd-stable/src/basic/sort-util.h |
24 | @@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn | 24 | @@ -54,17 +54,3 @@ static inline void _qsort_safe(void *bas |
25 | int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \ | 25 | int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \ |
26 | qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ | 26 | _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ |
27 | }) | 27 | }) |
28 | - | 28 | - |
29 | -static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) { | 29 | -static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) { |
@@ -39,11 +39,11 @@ index e029f8646eb0..27d68b341cf3 100644 | |||
39 | - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ | 39 | - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ |
40 | - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ | 40 | - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ |
41 | - }) | 41 | - }) |
42 | diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c | 42 | Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c |
43 | index d790e8fd0b19..42e0fd7c9b3c 100644 | 43 | =================================================================== |
44 | --- a/src/libsystemd/sd-hwdb/hwdb-util.c | 44 | --- systemd-stable.orig/src/libsystemd/sd-hwdb/hwdb-util.c |
45 | +++ b/src/libsystemd/sd-hwdb/hwdb-util.c | 45 | +++ systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c |
46 | @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { | 46 | @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) |
47 | 47 | ||
48 | DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); | 48 | DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); |
49 | 49 | ||
@@ -60,7 +60,7 @@ index d790e8fd0b19..42e0fd7c9b3c 100644 | |||
60 | } | 60 | } |
61 | 61 | ||
62 | static int trie_node_add_value(struct trie *trie, struct trie_node *node, | 62 | static int trie_node_add_value(struct trie *trie, struct trie_node *node, |
63 | @@ -158,7 +162,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, | 63 | @@ -158,7 +162,10 @@ static int trie_node_add_value(struct tr |
64 | .value_off = v, | 64 | .value_off = v, |
65 | }; | 65 | }; |
66 | 66 | ||
@@ -72,7 +72,7 @@ index d790e8fd0b19..42e0fd7c9b3c 100644 | |||
72 | if (val) { | 72 | if (val) { |
73 | /* At this point we have 2 identical properties on the same match-string. | 73 | /* At this point we have 2 identical properties on the same match-string. |
74 | * Since we process files in order, we just replace the previous value. */ | 74 | * Since we process files in order, we just replace the previous value. */ |
75 | @@ -184,7 +191,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, | 75 | @@ -184,7 +191,9 @@ static int trie_node_add_value(struct tr |
76 | .line_number = line_number, | 76 | .line_number = line_number, |
77 | }; | 77 | }; |
78 | node->values_count++; | 78 | node->values_count++; |
@@ -83,11 +83,11 @@ index d790e8fd0b19..42e0fd7c9b3c 100644 | |||
83 | return 0; | 83 | return 0; |
84 | } | 84 | } |
85 | 85 | ||
86 | diff --git a/src/shared/format-table.c b/src/shared/format-table.c | 86 | Index: systemd-stable/src/shared/format-table.c |
87 | index 425013046491..33c1c5a12d43 100644 | 87 | =================================================================== |
88 | --- a/src/shared/format-table.c | 88 | --- systemd-stable.orig/src/shared/format-table.c |
89 | +++ b/src/shared/format-table.c | 89 | +++ systemd-stable/src/shared/format-table.c |
90 | @@ -1164,31 +1164,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t | 90 | @@ -1246,31 +1246,33 @@ static int cell_data_compare(TableData * |
91 | return CMP(index_a, index_b); | 91 | return CMP(index_a, index_b); |
92 | } | 92 | } |
93 | 93 | ||
@@ -131,7 +131,7 @@ index 425013046491..33c1c5a12d43 100644 | |||
131 | } | 131 | } |
132 | 132 | ||
133 | /* Order identical lines by the order there were originally added in */ | 133 | /* Order identical lines by the order there were originally added in */ |
134 | @@ -1690,7 +1692,12 @@ int table_print(Table *t, FILE *f) { | 134 | @@ -1798,7 +1800,12 @@ int table_print(Table *t, FILE *f) { |
135 | for (i = 0; i < n_rows; i++) | 135 | for (i = 0; i < n_rows; i++) |
136 | sorted[i] = i * t->n_columns; | 136 | sorted[i] = i * t->n_columns; |
137 | 137 | ||
@@ -145,7 +145,7 @@ index 425013046491..33c1c5a12d43 100644 | |||
145 | } | 145 | } |
146 | 146 | ||
147 | if (t->display_map) | 147 | if (t->display_map) |
148 | @@ -2236,7 +2243,12 @@ int table_to_json(Table *t, JsonVariant **ret) { | 148 | @@ -2375,7 +2382,12 @@ int table_to_json(Table *t, JsonVariant |
149 | for (i = 0; i < n_rows; i++) | 149 | for (i = 0; i < n_rows; i++) |
150 | sorted[i] = i * t->n_columns; | 150 | sorted[i] = i * t->n_columns; |
151 | 151 | ||