diff options
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch index 1707683a26..68bf22de8c 100644 --- a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch +++ b/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch | |||
@@ -13,22 +13,21 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | |||
13 | libfdisk/src/sun.c | 5 ++--- | 13 | libfdisk/src/sun.c | 5 ++--- |
14 | 1 file changed, 2 insertions(+), 3 deletions(-) | 14 | 1 file changed, 2 insertions(+), 3 deletions(-) |
15 | 15 | ||
16 | diff --git a/libfdisk/src/sun.c b/libfdisk/src/sun.c | 16 | Index: util-linux-2.24.2/libfdisk/src/sun.c |
17 | index e73c701..f7899ec 100644 | 17 | =================================================================== |
18 | --- a/libfdisk/src/sun.c | 18 | --- util-linux-2.24.2.orig/libfdisk/src/sun.c |
19 | +++ b/libfdisk/src/sun.c | 19 | +++ util-linux-2.24.2/libfdisk/src/sun.c |
20 | @@ -427,9 +427,8 @@ static int sun_verify_disklabel(struct fdisk_context *cxt) | 20 | @@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f |
21 | else | ||
22 | array[i] = -1; | ||
23 | } | 21 | } |
22 | verify_sun_starts = starts; | ||
23 | |||
24 | - qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), | 24 | - qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), |
25 | - (int (*)(const void *,const void *,void *)) verify_sun_cmp, | 25 | - (int (*)(const void *,const void *,void *)) verify_sun_cmp, |
26 | - verify_sun_starts); | 26 | - verify_sun_starts); |
27 | - | ||
27 | + qsort(array,ARRAY_SIZE(array),sizeof(array[0]), | 28 | + qsort(array,ARRAY_SIZE(array),sizeof(array[0]), |
28 | + (int (*)(const void *,const void *)) verify_sun_cmp); | 29 | + (int (*)(const void *,const void *)) verify_sun_cmp); |
29 | 30 | + | |
30 | if (array[0] == -1) { | 31 | if (array[0] == -1) { |
31 | fdisk_info(cxt, _("No partitions defined.")); | 32 | fdisk_info(cxt, _("No partitions defined.")); |
32 | -- | 33 | return 0; |
33 | 1.8.2.1 | ||
34 | |||