[PATCH] minor code cleanups

[Andreas Dilger]

Andrew,
a minor cleanup of a couple functions.  Take or leave as you feel appropriate.

Cheers, Andreas
============================================================================
--- parted-1.6.0-pre2-aed/libparted/disk.c      Wed Feb 13 15:34:10 2002
+++ parted-1.6.0-pre2/libparted/disk.c  Wed Mar  6 23:57:05 2002
@@ -128,35 +128,35 @@
 ped_disk_new (PedDevice* dev)
 {
        PedDiskType*    type;
-       PedDisk*        disk;
+       PedDisk*        disk = NULL;
 
        PED_ASSERT (dev != NULL, return NULL);
 
        if (!ped_device_open (dev))
-               goto error;
+               goto out;
 
        type = ped_disk_probe (dev);
        if (!type) {
                ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
                        _("Unable to open %s - unrecognised disk label."),
                        dev->path);
-               goto error_close_dev;
+               goto close_dev;
        }
        disk = ped_disk_new_fresh (dev, type);
        if (!disk)
-               goto error_close_dev;
-       if (!type->ops->read (disk))
-               goto error_destroy_disk;
-       disk->needs_clobber = 0;
-       ped_device_close (dev);
-       return disk;
+               goto close_dev;
 
-error_destroy_disk:
-       ped_disk_destroy (disk);
-error_close_dev:
+       if (type->ops->read (disk)) {
+               disk->needs_clobber = 0;
+       } else {
+               ped_disk_destroy (disk);
+               disk = NULL;
+       }
+
+close_dev:
        ped_device_close (dev);
-error:
-       return NULL;
+out:
+       return disk;
 }
 
 static int
--- parted-1.6.0-pre2-aed/libparted/linux.c     Mon Mar  4 01:07:00 2002
+++ parted-1.6.0-pre2/libparted/linux.c Thu Mar  7 01:24:40 2002
@@ -1610,14 +1610,12 @@
 _blkpg_add_partition (PedDisk* disk, PedPartition* part)
 {
        struct blkpg_partition  linux_part;
-       const char*             vol_name;
+       const char*             vol_name = NULL;
        char*                   dev_name;
 
        if (ped_disk_type_check_feature (disk->type,
                                         PED_DISK_TYPE_PARTITION_NAME))
                vol_name = ped_partition_get_name (part);
-       else
-               vol_name = NULL;
 
        dev_name = _device_get_part_path (disk->dev, part->num);
        if (!dev_name)
--
Andreas Dilger
http://sourceforge.net/projects/ext2resize/
http://www-mddsp.enel.ucalgary.ca/People/adilger/