Changes done on darcs repository suitable for 1.8 release:

Fri Nov 10 23:19:15 BRST 2006  Otavio Salvador <otavio@debian.org>
  * Code clean-up on registering and unregistering of disks

        * libparted/disk.c (ped_register_disk_type, ped_unregister_disk_type):
        Clean-up. Patch sent by Debarshi 'Rishi' Ray <debarshi.ray@gmail.com>.

Fri Nov 10 23:14:58 BRST 2006  Otavio Salvador <otavio@debian.org>
  * Fix filesystem unregistering

        * libparted/filesys.c (ped_file_system_type_unregister): Handle
        instances where fs_types == NULL and the given fs_type is not in
        the list of registered file-system types. Some code clean-up.
        Patch sent by Debarshi 'Rishi' Ray <debarshi.ray@gmail.com>.

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

diff --git a/libparted/ChangeLog b/libparted/ChangeLog
index 2b60907..bc60aef 100644 (file)
--- a/libparted/ChangeLog
+++ b/libparted/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-10  Otavio Salvador  <otavio@debian.org>
+
+       * libparted/filesys.c (ped_file_system_type_unregister): Handle
+       instances where fs_types == NULL and the given fs_type is not in
+       the list of registered file-system types. Some code clean-up.
+       Patch sent by Debarshi 'Rishi' Ray <debarshi.ray@gmail.com>.
+
+       * libparted/disk.c (ped_register_disk_type, ped_unregister_disk_type):
+       Clean-up. Patch sent by Debarshi 'Rishi' Ray <debarshi.ray@gmail.com>.
+       
 2006-11-08  Otavio Salvador  <otavio@debian.org>
 
        * libparted/fs/hfs/probe.c: Fix a segmentation fault when running

diff --git a/libparted/disk.c b/libparted/disk.c
index c17488b..2fbf807 100644 (file)
--- a/libparted/disk.c
+++ b/libparted/disk.c
@@ -65,33 +65,32 @@ static int _disk_raw_add (PedDisk* disk, PedPartition* part);
 static PedDiskType*    disk_types = NULL;
 
 void
-ped_register_disk_type (PedDiskType* type)
+ped_register_disk_type (PedDiskType* disk_type)
 {
-       PED_ASSERT (type != NULL, return);
-       PED_ASSERT (type->ops != NULL, return);
-       PED_ASSERT (type->name != NULL, return);
+       PED_ASSERT (disk_type != NULL, return);
+       PED_ASSERT (disk_type->ops != NULL, return);
+       PED_ASSERT (disk_type->name != NULL, return);
        
-       ((struct _PedDiskType*) type)->next = disk_types;
-       disk_types = (struct _PedDiskType*) type;
+       /* pretend that "next" isn't part of the struct :-) */
+       ((struct _PedDiskType*) disk_type)->next = disk_types;
+       disk_types = (struct _PedDiskType*) disk_type;
 }
 
-void ped_unregister_disk_type (PedDiskType* type)
+void ped_unregister_disk_type (PedDiskType* disk_type)
 {
        PedDiskType*    walk;
        PedDiskType*    last = NULL;
 
        PED_ASSERT (disk_types != NULL, return);
-       PED_ASSERT (type != NULL, return);
+       PED_ASSERT (disk_type != NULL, return);
 
-       for (walk = disk_types; walk; last = walk, walk = walk->next) {
-               if (walk == type) break;
-       }
+       for (walk = disk_types; walk && walk != disk_type; last = walk, walk = walk->next);
 
        PED_ASSERT (walk != NULL, return);
        if (last)
-               ((struct _PedDiskType*) last)->next = type->next;
+               ((struct _PedDiskType*) last)->next = disk_type->next;
        else
-               disk_types = type->next;
+               disk_types = disk_type->next;
 }
 
 /**

diff --git a/libparted/filesys.c b/libparted/filesys.c
index cf33f96..04f551c 100644 (file)
--- a/libparted/filesys.c
+++ b/libparted/filesys.c
@@ -62,18 +62,16 @@ ped_file_system_type_unregister (PedFileSystemType* fs_type)
        PedFileSystemType*      walk;
        PedFileSystemType*      last = NULL;
 
+       PED_ASSERT (fs_types != NULL, return);
        PED_ASSERT (fs_type != NULL, return);
 
-       for (walk = fs_types; walk != fs_type; walk = walk->next) {
-               if (!walk) return;
-               last = walk;
-       }
+       for (walk = fs_types; walk && walk != fs_type; last = walk, walk = walk->next);
 
-       if (last) {
+       PED_ASSERT (walk != NULL, return);
+       if (last)
                ((struct _PedFileSystemType*) last)->next = fs_type->next;
-       } else {
-               fs_types = fs_types->next;
-       }
+       else
+               fs_types = fs_type->next;       
 }
 
 /**