[Parted-commits] GNU Parted Official Repository: Changes to 'master'

[Jim Meyering]

 Makefile.am           |    2 +-
 parted/parted.c       |    5 ++---
 tests/t9021-maxima.sh |    3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 70647d3ddfc0cb9f0aa5734ef2ab4a6102906801
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Jan 30 17:53:52 2010 +0100

    build: fix check-other-sector_sizes
    
    "make check-other-sector_sizes" was running tests of 512-byte sectors
    four times, rather than simulating larger sector-sizes for the latter
    three iterations.
    * Makefile.am (ss-1024 ss-2048 ss-4096): Fix the typo (missing "subst").

diff --git a/Makefile.am b/Makefile.am
index 0e80967..d5a32ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,7 +78,7 @@ MAINTAINERCLEANFILES += \
 
 .PHONY: ss-1024 ss-2048 ss-4096
 ss-1024 ss-2048 ss-4096:
-	PARTED_SECTOR_SIZE=$(ss-,,$@) $(MAKE) check-recursive
+	PARTED_SECTOR_SIZE=$(subst ss-,,$@) $(MAKE) check-recursive
 
 # Run the regression test suite with different settings,
 # to ensure it works with simulated partition sizes > 512.

commit e596dfcf0fe404b3dd0cea385b3590581413aaee
Author: Jim Meyering <meyering at redhat.com>
Date:   Sun Jan 31 15:52:02 2010 +0100

    tests: adjust t9021-maxima not to fail with 2048-byte sectors
    
    * tests/t9021-maxima.sh: At 10,000*512 bytes, the backing file
    was too small to support a test simulating a sector size of 2048 bytes.
    Use 10,000*$sector_size bytes instead.

diff --git a/tests/t9021-maxima.sh b/tests/t9021-maxima.sh
index 999a696..eb44eea 100755
--- a/tests/t9021-maxima.sh
+++ b/tests/t9021-maxima.sh
@@ -23,6 +23,7 @@ fi
 
 : ${srcdir=.}
 . $srcdir/t-lib.sh
+ss=$sector_size_
 
 fail=0
 dev=dev-file
@@ -33,7 +34,7 @@ export PATH
 for t in msdos gpt dvh sun mac bsd amiga loop pc98; do
     echo $t
     rm -f $dev
-    dd if=/dev/zero of=$dev bs=512 count=1 seek=10000 || { fail=1; continue; }
+    dd if=/dev/zero of=$dev bs=$ss count=1 seek=10000 || { fail=1; continue; }
     parted -s $dev mklabel $t || { fail=1; continue; }
 
     #case $t in pc98) sleep 999d;; esac

commit 2f1828c6e01968db108084e19f3edea0190e83bd
Author: Jim Meyering <meyering at redhat.com>
Date:   Sun Jan 31 15:43:20 2010 +0100

    build: avoid -Wshadow warnings
    
    * parted/parted.c (do_print): Avoid two shadowing warnings.

diff --git a/parted/parted.c b/parted/parted.c
index c4d1779..eb2cea4 100644
--- a/parted/parted.c
+++ b/parted/parted.c
@@ -830,7 +830,7 @@ do_mkpart (PedDevice** dev)
                 ped_exception_leave_all();
 
                 PedConstraint *constraint_any = ped_constraint_any (*dev);
-                bool added_ok = ped_disk_add_partition (disk, part,
+                added_ok = ped_disk_add_partition (disk, part,
                                                         constraint_any);
                 ped_constraint_destroy (constraint_any);
                 if (added_ok) {
@@ -1346,7 +1346,6 @@ do_print (PedDevice** dev)
         char*           size;
         const char*     name;
         char*           tmp;
-        char*           flags;
         wchar_t*        table_rendered;
 
         disk = ped_disk_new (*dev);
@@ -1549,7 +1548,7 @@ do_print (PedDevice** dev)
                                     str_list_append (row, name);
                             }
 
-                            flags = partition_print_flags (part);
+                            char *flags = partition_print_flags (part);
                             str_list_append (row, flags);
                             free (flags);
                     } else {