diff options
author | Luka Perkov <luka@openwrt.org> | 2014-11-30 22:11:09 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-11-30 22:11:09 +0000 |
commit | e24ab7ea3203dade28029f6f9569a3ae72c4bbf2 (patch) | |
tree | c4ddd1a9011fb900178fba902010e3337bc04122 /package/utils/util-linux/patches/100-fdisk_use_qsort.patch | |
parent | d6ec05aec4810caac3f067b0fa4d358af353987d (diff) | |
download | upstream-e24ab7ea3203dade28029f6f9569a3ae72c4bbf2.tar.gz upstream-e24ab7ea3203dade28029f6f9569a3ae72c4bbf2.tar.bz2 upstream-e24ab7ea3203dade28029f6f9569a3ae72c4bbf2.zip |
util-linux: update to 2.25.2
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43443 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 36 |
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.")); |