aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/util-linux/patches/100-fdisk_use_qsort.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-11-30 22:11:09 +0000
committerLuka Perkov <luka@openwrt.org>2014-11-30 22:11:09 +0000
commit3534e26463e74586700800ca96f1443da338832d (patch)
tree96617913cbae7d5a97b1ae49167bf4921b980598 /package/utils/util-linux/patches/100-fdisk_use_qsort.patch
parent62100c31d60d1af9831f9cb85bc00cd019f1170e (diff)
downloadupstream-3534e26463e74586700800ca96f1443da338832d.tar.gz
upstream-3534e26463e74586700800ca96f1443da338832d.tar.bz2
upstream-3534e26463e74586700800ca96f1443da338832d.zip
util-linux: update to 2.25.2
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 43443
Diffstat (limited to 'package/utils/util-linux/patches/100-fdisk_use_qsort.patch')
-rw-r--r--package/utils/util-linux/patches/100-fdisk_use_qsort.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/package/utils/util-linux/patches/100-fdisk_use_qsort.patch b/package/utils/util-linux/patches/100-fdisk_use_qsort.patch
deleted file mode 100644
index 5ed4806a29..0000000000
--- a/package/utils/util-linux/patches/100-fdisk_use_qsort.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/libfdisk/src/sun.c
-+++ b/libfdisk/src/sun.c
-@@ -361,10 +361,10 @@ static void fetch_sun(struct fdisk_conte
- }
- }
-
--static int verify_sun_cmp(int *a, int *b, void *data)
--{
-- unsigned int *verify_sun_starts = (unsigned int *) data;
-+static unsigned int *verify_sun_starts;
-
-+static int verify_sun_cmp(int *a, int *b)
-+{
- if (*a == -1)
- return 1;
- if (*b == -1)
-@@ -379,7 +379,6 @@ static int sun_verify_disklabel(struct f
- uint32_t starts[SUN_MAXPARTITIONS], lens[SUN_MAXPARTITIONS], start, stop;
- uint32_t i,j,k,starto,endo;
- int array[SUN_MAXPARTITIONS];
-- unsigned int *verify_sun_starts;
-
- assert(cxt);
- assert(cxt->label);
-@@ -427,9 +426,8 @@ static int sun_verify_disklabel(struct f
- else
- array[i] = -1;
- }
-- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
-- (int (*)(const void *,const void *,void *)) verify_sun_cmp,
-- verify_sun_starts);
-+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]),
-+ (int (*)(const void *,const void *)) verify_sun_cmp);
-
- if (array[0] == -1) {
- fdisk_info(cxt, _("No partitions defined."));