Changes done on darcs repository suitable for 1.8 release:

Wed Nov  8 20:40:43 BRST 2006  Otavio Salvador <otavio@debian.org>
  * Merge libparted/ChangeLog conflict caused by Subversion syncing

Wed Nov  8 21:15:58 BRST 2006  Otavio Salvador <otavio@debian.org>
  * doc/C/parted.8: small documentation simplification

Wed Nov  8 20:09:03 BRST 2006  Otavio Salvador <otavio@debian.org>
  * libparted/fs/hfs/probe.c: Fix a segmentation fault when running without debug

git-svn-id: svn://svn.debian.org/svn/parted/upstream/trunk@890 2d424fd7-7fe2-0310-af74-8bc65edeb173

diff --git a/ChangeLog b/ChangeLog
index f63a322..b1f5d49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@ front-end.  This file is only for reference purposes and top-level changes.
 See libparted/ChangeLog and parted/ChangeLog.
 
 ==============================================================================
+2006-11-08  Otavio Salvador <otavio@debian.org>
+
+       * doc/C/parted.8: small documentation simplification.
+       
 2006-10-11  David Cantrell  <dcantrell@redhat.com>
        * include/parted/device.h: Add PED_DEVICE_DM if device-mapper is
        enabled.

diff --git a/doc/C/parted.8 b/doc/C/parted.8
index 4bb50df..dd5199b 100644 (file)
--- a/doc/C/parted.8
+++ b/doc/C/parted.8
@@ -22,10 +22,10 @@ reorganising disk usage, and copying data to new hard disks.
 displays a help message.
 .TP
 .B -i, --interactive
-where necessary, prompts for user intervention.
+prompts for user intervention.
 .TP
 .B -s, --script
-never prompts for user intervention.
+never prompt the user.
 .TP
 .B -v, --version
 displays the version.

diff --git a/libparted/ChangeLog b/libparted/ChangeLog
index cbd57cb..2b60907 100644 (file)
--- a/libparted/ChangeLog
+++ b/libparted/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08  Otavio Salvador  <otavio@debian.org>
+
+       * libparted/fs/hfs/probe.c: Fix a segmentation fault when running
+       without debug.
+
 2006-11-05  David Cantrell  <dcantrell@redhat.com>
        * arch/linux.c: Define PROC_DEVICES_BUFSIZ for reading /proc/devices,
        set to 16384.

diff --git a/libparted/fs/hfs/probe.c b/libparted/fs/hfs/probe.c
index 3fd9ef7..c901c16 100644 (file)
--- a/libparted/fs/hfs/probe.c
+++ b/libparted/fs/hfs/probe.c
@@ -42,8 +42,9 @@ hfsc_can_use_geom (PedGeometry* geom)
 {
        PedDevice* dev;
 
+       dev = geom->dev;
        PED_ASSERT (geom != NULL, return 0);
-       PED_ASSERT ((dev = geom->dev) != NULL, return 0);
+       PED_ASSERT (dev != NULL, return 0);
 
        if (dev->sector_size != PED_SECTOR_SIZE_DEFAULT) {
                ped_exception_throw (