Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From f220d809be1baa654503bf6ff52f3630b0d7015c Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Wed, 26 Mar 2014 01:30:29 +0000 |
| 4 | Subject: [PATCH] sun.c: use qsort() to instead of qsort_r() |
| 5 | |
| 6 | qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on |
| 7 | the host like CentOS 5.x. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [Other] |
| 10 | |
| 11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 12 | --- |
| 13 | libfdisk/src/sun.c | 5 ++--- |
| 14 | 1 file changed, 2 insertions(+), 3 deletions(-) |
| 15 | |
| 16 | Index: util-linux-2.24.2/libfdisk/src/sun.c |
| 17 | =================================================================== |
| 18 | --- util-linux-2.24.2.orig/libfdisk/src/sun.c |
| 19 | +++ util-linux-2.24.2/libfdisk/src/sun.c |
| 20 | @@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f |
| 21 | } |
| 22 | verify_sun_starts = starts; |
| 23 | |
| 24 | - qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), |
| 25 | - (int (*)(const void *,const void *,void *)) verify_sun_cmp, |
| 26 | - verify_sun_starts); |
| 27 | - |
| 28 | + qsort(array,ARRAY_SIZE(array),sizeof(array[0]), |
| 29 | + (int (*)(const void *,const void *)) verify_sun_cmp); |
| 30 | + |
| 31 | if (array[0] == -1) { |
| 32 | fdisk_info(cxt, _("No partitions defined.")); |
| 33 | return 0; |