aboutsummaryrefslogtreecommitdiffstats
path: root/testing/fatresize
diff options
context:
space:
mode:
Diffstat (limited to 'testing/fatresize')
-rw-r--r--testing/fatresize/fatresize-1.0.2-libparted_ver_check.patch14
-rw-r--r--testing/fatresize/fatresize-1.0.2-ped_assert.patch21
-rw-r--r--testing/fatresize/fatresize-1.0.2-ped_free.patch29
3 files changed, 0 insertions, 64 deletions
diff --git a/testing/fatresize/fatresize-1.0.2-libparted_ver_check.patch b/testing/fatresize/fatresize-1.0.2-libparted_ver_check.patch
deleted file mode 100644
index 333d774831..0000000000
--- a/testing/fatresize/fatresize-1.0.2-libparted_ver_check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up fatresize-1.0.2/configure.ac.orig fatresize-1.0.2/configure.ac
---- fatresize-1.0.2/configure.ac.orig 2005-09-20 10:30:35.000000000 +0200
-+++ fatresize-1.0.2/configure.ac 2012-12-17 23:33:06.238862845 +0100
-@@ -29,8 +29,8 @@ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=${ac
- dnl libparted
- # hack
- LIBS="$LIBS -ldl"
--PARTED_CHECK_LIBPARTED(1.6.0, ,
-- [AC_MSG_ERROR([*** libparted >= 1.6.0 not installed - please install first ***])])
-+AC_CHECK_LIB(parted, ped_malloc, [], AC_MSG_ERROR([*** libparted >= 3.1.0 not installed - please install first ***]))
-+AC_CHECK_LIB(parted-fs-resize, ped_file_system_open, [], AC_MSG_ERROR([*** libparted-fs-resize >= 3.1.0 not installed - please install first ***]))
-
- AC_SUBST(PARTED_LIBS)
-
diff --git a/testing/fatresize/fatresize-1.0.2-ped_assert.patch b/testing/fatresize/fatresize-1.0.2-ped_assert.patch
deleted file mode 100644
index 34877fc844..0000000000
--- a/testing/fatresize/fatresize-1.0.2-ped_assert.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up fatresize-1.0.2/fatresize.c.orig fatresize-1.0.2/fatresize.c
---- fatresize-1.0.2/fatresize.c.orig 2005-09-20 10:29:08.000000000 +0200
-+++ fatresize-1.0.2/fatresize.c 2012-12-18 00:07:00.000000000 +0100
-@@ -217,7 +217,7 @@ fatresize_handler(PedException *ex)
- static int
- snap(PedSector* sector, PedSector new_sector, PedGeometry* range)
- {
-- PED_ASSERT(ped_geometry_test_sector_inside (range, *sector), return 0);
-+ PED_ASSERT(ped_geometry_test_sector_inside (range, *sector));
- if (!ped_geometry_test_sector_inside(range, new_sector))
- return 0;
-
-@@ -281,7 +281,7 @@ snap_to_boundaries (PedGeometry* new_geo
- end_part->geom.end, end_part->geom.start - 1, -1);
- }
-
-- PED_ASSERT (start <= end, return);
-+ PED_ASSERT (start <= end);
- ped_geometry_set (new_geom, start, end - start + 1);
- }
-
diff --git a/testing/fatresize/fatresize-1.0.2-ped_free.patch b/testing/fatresize/fatresize-1.0.2-ped_free.patch
deleted file mode 100644
index 77f4be4a82..0000000000
--- a/testing/fatresize/fatresize-1.0.2-ped_free.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up fatresize-1.0.2/fatresize.c.orig fatresize-1.0.2/fatresize.c
---- fatresize-1.0.2/fatresize.c.orig 2005-09-20 10:29:08.000000000 +0200
-+++ fatresize-1.0.2/fatresize.c 2012-12-18 00:19:45.061745003 +0100
-
-@@ -320,11 +320,11 @@ partition_warn_busy(PedPartition* part)
- ("Partition %s is being used. You must unmount it "
- "before you modify it with Parted."),
- path);
-- ped_free(path);
-+ free(path);
- return 0;
- }
-
-- ped_free(path);
-+ free(path);
- return 1;
- }
-
-@@ -507,8 +507,8 @@ main(int argc, char **argv)
- }
- else if (!ped_unit_parse(def_str, dev, &end, &range_end))
- return 1;
-- ped_free(old_str);
-- ped_free(def_str);
-+ free(old_str);
-+ free(def_str);
-
- printd(3, "ped_geometry_duplicate()\n");
- old_geom = ped_geometry_duplicate(&part->geom);