diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-08-28 10:50:38 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-04 11:03:55 +0100 |
commit | 4ec1eede9fb98b83792f17b63804a9c488b7e016 (patch) | |
tree | 8281e6d29728d5a6762b98079557ead27dd993a1 | |
parent | 7a812523a75266752f0c67f6eb1e4691bc09bd4a (diff) | |
download | poky-4ec1eede9fb98b83792f17b63804a9c488b7e016.tar.gz |
systemd: Fix qsort_r patch for function return mismatch
clang is fussy and complains that a valueless return is used from a
function which should return a value
(From OE-Core rev: 301d9801a43b2173c83a2296553abd53f152a145)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch | 16 |
1 files changed, 8 insertions, 8 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 f07211bd8a..8e0d669e83 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From d43faf6d253db789225b7c454c8f255fbc68857e Mon Sep 17 00:00:00 2001 | 1 | From d74a4de6daea5a511c2b5636bbb552c15b3a4ad9 Mon Sep 17 00:00:00 2001 |
2 | From: Emil Renner Berthing <systemd@esmil.dk> | 2 | From: Emil Renner Berthing <systemd@esmil.dk> |
3 | Date: Thu, 18 Sep 2014 15:24:56 +0200 | 3 | Date: Thu, 18 Sep 2014 15:24:56 +0200 |
4 | Subject: [PATCH 02/19] don't use glibc-specific qsort_r | 4 | Subject: [PATCH] don't use glibc-specific qsort_r |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 6 | Upstream-Status: Inappropriate [musl specific] |
7 | 7 | ||
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 4 files changed, 37 insertions(+), 31 deletions(-) | 14 | 4 files changed, 37 insertions(+), 31 deletions(-) |
15 | 15 | ||
16 | diff --git a/src/basic/format-table.c b/src/basic/format-table.c | 16 | diff --git a/src/basic/format-table.c b/src/basic/format-table.c |
17 | index 94e796d1c..f7b4eade9 100644 | 17 | index 94e796d1ca..9b3f35c29a 100644 |
18 | --- a/src/basic/format-table.c | 18 | --- a/src/basic/format-table.c |
19 | +++ b/src/basic/format-table.c | 19 | +++ b/src/basic/format-table.c |
20 | @@ -745,29 +745,29 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t | 20 | @@ -745,29 +745,29 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t |
@@ -63,7 +63,7 @@ index 94e796d1c..f7b4eade9 100644 | |||
63 | 63 | ||
64 | - qsort_r_safe(sorted, n_rows, sizeof(size_t), table_data_compare, t); | 64 | - qsort_r_safe(sorted, n_rows, sizeof(size_t), table_data_compare, t); |
65 | + if (n_rows <= 1) | 65 | + if (n_rows <= 1) |
66 | + return; | 66 | + return 0; |
67 | + assert(sorted); | 67 | + assert(sorted); |
68 | + user_table = t; | 68 | + user_table = t; |
69 | + qsort(sorted, n_rows, sizeof(size_t), table_data_compare); | 69 | + qsort(sorted, n_rows, sizeof(size_t), table_data_compare); |
@@ -72,7 +72,7 @@ index 94e796d1c..f7b4eade9 100644 | |||
72 | 72 | ||
73 | if (t->display_map) | 73 | if (t->display_map) |
74 | diff --git a/src/basic/util.h b/src/basic/util.h | 74 | diff --git a/src/basic/util.h b/src/basic/util.h |
75 | index 9699d228f..40eaf518c 100644 | 75 | index 9699d228f9..40eaf518cb 100644 |
76 | --- a/src/basic/util.h | 76 | --- a/src/basic/util.h |
77 | +++ b/src/basic/util.h | 77 | +++ b/src/basic/util.h |
78 | @@ -105,13 +105,6 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, comparison_ | 78 | @@ -105,13 +105,6 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, comparison_ |
@@ -90,7 +90,7 @@ index 9699d228f..40eaf518c 100644 | |||
90 | /** | 90 | /** |
91 | * Normal memcpy requires src to be nonnull. We do nothing if n is 0. | 91 | * Normal memcpy requires src to be nonnull. We do nothing if n is 0. |
92 | diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c | 92 | diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c |
93 | index 317cad8a6..701d59a1e 100644 | 93 | index 317cad8a67..701d59a1eb 100644 |
94 | --- a/src/hwdb/hwdb.c | 94 | --- a/src/hwdb/hwdb.c |
95 | +++ b/src/hwdb/hwdb.c | 95 | +++ b/src/hwdb/hwdb.c |
96 | @@ -135,13 +135,12 @@ static void trie_free(struct trie *trie) { | 96 | @@ -135,13 +135,12 @@ static void trie_free(struct trie *trie) { |
@@ -135,7 +135,7 @@ index 317cad8a6..701d59a1e 100644 | |||
135 | } | 135 | } |
136 | 136 | ||
137 | diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c | 137 | diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c |
138 | index 02408a428..491d367d1 100644 | 138 | index 02408a4285..491d367d12 100644 |
139 | --- a/src/udev/udevadm-hwdb.c | 139 | --- a/src/udev/udevadm-hwdb.c |
140 | +++ b/src/udev/udevadm-hwdb.c | 140 | +++ b/src/udev/udevadm-hwdb.c |
141 | @@ -114,13 +114,13 @@ static void trie_node_cleanup(struct trie_node *node) { | 141 | @@ -114,13 +114,13 @@ static void trie_node_cleanup(struct trie_node *node) { |
@@ -179,5 +179,5 @@ index 02408a428..491d367d1 100644 | |||
179 | } | 179 | } |
180 | 180 | ||
181 | -- | 181 | -- |
182 | 2.11.0 | 182 | 2.18.0 |
183 | 183 | ||