> Here is a patch to replace ped_[register|unregister]_disk_type with
> ped_disk_type_[register|unregister], and deprecate the former. I have
> used the __attribute__ ((deprecated)) technique to do this.
>
> What do you think?
I didn't find the prototype tagged as deprecated.
That was because I had given you the output of:
$ diff -urNp parted/libparted parted-build/libparted
My mistake. Here is the diff of the entire tree.
Happy hacking,
Debarshi
--
After the game the king and the pawn go into the same box.
-- Italian proverb
diff -urNp parted/include/parted/disk.h parted-build/include/parted/disk.h
--- parted/include/parted/disk.h 2007-01-14 20:11:51.000000000 +0530
+++ parted-build/include/parted/disk.h 2007-02-15 07:15:41.000000000 +0530
@@ -222,8 +222,21 @@ struct _PedDiskArchOps {
int (*disk_commit) (PedDisk* disk);
};
+extern void ped_disk_type_register (PedDiskType* type);
+extern void ped_disk_type_unregister (PedDiskType* type);
+
+/**
+ * Deprecated: use ped_disk_type_register.
+ */
+__attribute__ ((deprecated))
extern void ped_register_disk_type (PedDiskType* type);
+
+/**
+ * Deprecated: use ped_disk_type_unregister.
+ */
+__attribute__ ((deprecated))
extern void ped_unregister_disk_type (PedDiskType* type);
+
extern PedDiskType* ped_disk_type_get_next (PedDiskType* type);
extern PedDiskType* ped_disk_type_get (const char* name);
extern int ped_disk_type_check_feature (const PedDiskType* disk_type,
diff -urNp parted/libparted/disk.c parted-build/libparted/disk.c
--- parted/libparted/disk.c 2007-01-31 02:02:27.000000000 +0530
+++ parted-build/libparted/disk.c 2007-02-15 07:21:44.000000000 +0530
@@ -63,7 +63,7 @@ static int _disk_raw_add (PedDisk* disk,
static PedDiskType* disk_types = NULL;
void
-ped_register_disk_type (PedDiskType* disk_type)
+ped_disk_type_register (PedDiskType* disk_type)
{
PED_ASSERT (disk_type != NULL, return);
PED_ASSERT (disk_type->ops != NULL, return);
@@ -74,7 +74,8 @@ ped_register_disk_type (PedDiskType* dis
disk_types = (struct _PedDiskType*) disk_type;
}
-void ped_unregister_disk_type (PedDiskType* disk_type)
+void
+ped_disk_type_unregister (PedDiskType* disk_type)
{
PedDiskType* walk;
PedDiskType* last = NULL;
@@ -93,6 +94,24 @@ void ped_unregister_disk_type (PedDiskTy
}
/**
+ * Deprecated: use ped_disk_type_regiser.
+ */
+void
+ped_register_disk_type (PedDiskType* disk_type)
+{
+ ped_disk_type_register (disk_type);
+}
+
+/**
+ * Deprecated: use ped_disk_type_unregiser.
+ */
+void
+ped_unregister_disk_type (PedDiskType* disk_type)
+{
+ ped_disk_type_unregister (disk_type);
+}
+
+/**
* Return the next disk type registers, after "type". If "type" is
* NULL, returns the first disk type.
*
@@ -2247,4 +2266,3 @@ ped_disk_print (PedDisk* disk)
}
/** @} */
-
diff -urNp parted/libparted/labels/aix.c parted-build/libparted/labels/aix.c
--- parted/libparted/labels/aix.c 2007-01-31 02:02:27.000000000 +0530
+++ parted-build/libparted/labels/aix.c 2007-02-15 07:28:55.000000000 +0530
@@ -270,11 +270,11 @@ void
ped_disk_aix_init ()
{
PED_ASSERT (sizeof (AixLabel) == 512, return);
- ped_register_disk_type (&aix_disk_type);
+ ped_disk_type_register (&aix_disk_type);
}
void
ped_disk_aix_done ()
{
- ped_unregister_disk_type (&aix_disk_type);
+ ped_disk_type_unregister (&aix_disk_type);
}
diff -urNp parted/libparted/labels/bsd.c parted-build/libparted/labels/bsd.c
--- parted/libparted/labels/bsd.c 2007-01-31 02:02:27.000000000 +0530
+++ parted-build/libparted/labels/bsd.c 2007-02-15 07:30:00.000000000 +0530
@@ -605,11 +605,11 @@ ped_disk_bsd_init ()
PED_ASSERT (sizeof (BSDRawPartition) == 16, return);
PED_ASSERT (sizeof (BSDRawLabel) == 276, return);
- ped_register_disk_type (&bsd_disk_type);
+ ped_disk_type_register (&bsd_disk_type);
}
void
ped_disk_bsd_done ()
{
- ped_unregister_disk_type (&bsd_disk_type);
+ ped_disk_type_unregister (&bsd_disk_type);
}
diff -urNp parted/libparted/labels/dasd.c parted-build/libparted/labels/dasd.c
--- parted/libparted/labels/dasd.c 2007-01-31 02:02:27.000000000 +0530
+++ parted-build/libparted/labels/dasd.c 2007-02-15 07:30:37.000000000 +0530
@@ -200,13 +200,13 @@ dasd_free (PedDisk* disk)
void
ped_disk_dasd_init ()
{
- ped_register_disk_type(&dasd_disk_type);
+ ped_disk_type_register(&dasd_disk_type);
}
void
ped_disk_dasd_done ()
{
- ped_unregister_disk_type(&dasd_disk_type);
+ ped_disk_type_unregister(&dasd_disk_type);
}
static int
diff -urNp parted/libparted/labels/dos.c parted-build/libparted/labels/dos.c
--- parted/libparted/labels/dos.c 2007-02-14 22:04:33.000000000 +0530
+++ parted-build/libparted/labels/dos.c 2007-02-15 07:31:21.000000000 +0530
@@ -2200,12 +2200,12 @@ ped_disk_msdos_init ()
PED_ASSERT (sizeof (DosRawPartition) == 16, return);
PED_ASSERT (sizeof (DosRawTable) == 512, return);
- ped_register_disk_type (&msdos_disk_type);
+ ped_disk_type_register (&msdos_disk_type);
}
void
ped_disk_msdos_done ()
{
- ped_unregister_disk_type (&msdos_disk_type);
+ ped_disk_type_unregister (&msdos_disk_type);
}
diff -urNp parted/libparted/labels/dvh.c parted-build/libparted/labels/dvh.c
--- parted/libparted/labels/dvh.c 2007-01-31 02:02:27.000000000 +0530
+++ parted-build/libparted/labels/dvh.c 2007-02-15 07:32:00.000000000 +0530
@@ -903,12 +903,12 @@ ped_disk_dvh_init ()
{
PED_ASSERT (sizeof (struct volume_header) == 512, return);
- ped_register_disk_type (&dvh_disk_type);
+ ped_disk_type_register (&dvh_disk_type);
}
void
ped_disk_dvh_done ()
{
- ped_unregister_disk_type (&dvh_disk_type);
+ ped_disk_type_unregister (&dvh_disk_type);
}
diff -urNp parted/libparted/labels/gpt.c parted-build/libparted/labels/gpt.c
--- parted/libparted/labels/gpt.c 2007-01-31 02:02:27.000000000 +0530
+++ parted-build/libparted/labels/gpt.c 2007-02-15 07:34:39.000000000 +0530
@@ -1490,15 +1490,15 @@ static PedDiskType gpt_disk_type = {
void
ped_disk_gpt_init()
{
- PED_ASSERT(sizeof(GuidPartitionEntryAttributes_t) == 8, return);
- PED_ASSERT(sizeof(GuidPartitionEntry_t) == 128, return);
+ PED_ASSERT (sizeof (GuidPartitionEntryAttributes_t) == 8, return);
+ PED_ASSERT (sizeof (GuidPartitionEntry_t) == 128, return);
- ped_register_disk_type(&gpt_disk_type);
+ ped_disk_type_register (&gpt_disk_type);
}
void
ped_disk_gpt_done()
{
- ped_unregister_disk_type(&gpt_disk_type);
+ ped_disk_type_unregister (&gpt_disk_type);
}
diff -urNp parted/libparted/labels/loop.c parted-build/libparted/labels/loop.c
--- parted/libparted/labels/loop.c 2007-01-31 02:02:27.000000000 +0530
+++ parted-build/libparted/labels/loop.c 2007-02-15 07:33:19.000000000 +0530
@@ -326,12 +326,12 @@ static PedDiskType loop_disk_type = {
void
ped_disk_loop_init ()
{
- ped_register_disk_type (&loop_disk_type);
+ ped_disk_type_register (&loop_disk_type);
}
void
ped_disk_loop_done ()
{
- ped_unregister_disk_type (&loop_disk_type);
+ ped_disk_type_unregister (&loop_disk_type);
}
diff -urNp parted/libparted/labels/mac.c parted-build/libparted/labels/mac.c
--- parted/libparted/labels/mac.c 2007-01-31 02:02:27.000000000 +0530
+++ parted-build/libparted/labels/mac.c 2007-02-15 07:37:03.000000000 +0530
@@ -1604,12 +1604,12 @@ ped_disk_mac_init ()
PED_ASSERT (sizeof (MacRawPartition) == 512, return);
PED_ASSERT (sizeof (MacRawDisk) == 512, return);
- ped_register_disk_type (&mac_disk_type);
+ ped_disk_type_register (&mac_disk_type);
}
void
ped_disk_mac_done ()
{
- ped_unregister_disk_type (&mac_disk_type);
+ ped_disk_type_unregister (&mac_disk_type);
}
diff -urNp parted/libparted/labels/pc98.c parted-build/libparted/labels/pc98.c
--- parted/libparted/labels/pc98.c 2007-01-31 02:02:27.000000000 +0530
+++ parted-build/libparted/labels/pc98.c 2007-02-15 07:36:31.000000000 +0530
@@ -881,11 +881,11 @@ void
ped_disk_pc98_init ()
{
PED_ASSERT (sizeof (PC98RawTable) == 512 * 2, return);
- ped_register_disk_type (&pc98_disk_type);
+ ped_disk_type_register (&pc98_disk_type);
}
void
ped_disk_pc98_done ()
{
- ped_unregister_disk_type (&pc98_disk_type);
+ ped_disk_type_unregister (&pc98_disk_type);
}
diff -urNp parted/libparted/labels/rdb.c parted-build/libparted/labels/rdb.c
--- parted/libparted/labels/rdb.c 2007-01-31 02:02:27.000000000 +0530
+++ parted-build/libparted/labels/rdb.c 2007-02-15 07:36:04.000000000 +0530
@@ -1173,17 +1173,17 @@ static PedDiskType amiga_disk_type = {
void
ped_disk_amiga_init ()
{
- PED_ASSERT(sizeof(struct AmigaBlock) != 3, return);
- PED_ASSERT(sizeof(struct RigidDiskBlock) != 64, return);
- PED_ASSERT(sizeof(struct PartitionBlock) != 64, return);
- PED_ASSERT(sizeof(struct LinkedBlock) != 5, return);
- PED_ASSERT(sizeof(struct Linked2Block) != 18, return);
+ PED_ASSERT (sizeof (struct AmigaBlock) != 3, return);
+ PED_ASSERT (sizeof (struct RigidDiskBlock) != 64, return);
+ PED_ASSERT (sizeof (struct PartitionBlock) != 64, return);
+ PED_ASSERT (sizeof (struct LinkedBlock) != 5, return);
+ PED_ASSERT (sizeof (struct Linked2Block) != 18, return);
- ped_register_disk_type (&amiga_disk_type);
+ ped_disk_type_register (&amiga_disk_type);
}
void
ped_disk_amiga_done ()
{
- ped_unregister_disk_type (&amiga_disk_type);
+ ped_disk_type_unregister (&amiga_disk_type);
}
diff -urNp parted/libparted/labels/sun.c parted-build/libparted/labels/sun.c
--- parted/libparted/labels/sun.c 2007-02-14 20:11:47.000000000 +0530
+++ parted-build/libparted/labels/sun.c 2007-02-15 07:35:30.000000000 +0530
@@ -840,12 +840,12 @@ void
ped_disk_sun_init ()
{
PED_ASSERT (sizeof (SunRawLabel) == 512, return);
- ped_register_disk_type (&sun_disk_type);
+ ped_disk_type_register (&sun_disk_type);
}
void
ped_disk_sun_done ()
{
- ped_unregister_disk_type (&sun_disk_type);
+ ped_disk_type_unregister (&sun_disk_type);
}
diff -urNp parted/scripts/data/abi/baseline_symbols.txt parted-build/scripts/data/abi/baseline_symbols.txt
--- parted/scripts/data/abi/baseline_symbols.txt 2007-01-14 20:11:51.000000000 +0530
+++ parted-build/scripts/data/abi/baseline_symbols.txt 2007-02-15 07:39:37.000000000 +0530
@@ -297,6 +297,8 @@ FUNC:ped_disk_sun_init
FUNC:ped_disk_type_check_feature
FUNC:ped_disk_type_get
FUNC:ped_disk_type_get_next
+FUNC:ped_disk_type_register
+FUNC:ped_disk_type_unregister
FUNC:ped_div_round_to_nearest
FUNC:ped_div_round_up
FUNC:ped_exception_catch
_______________________________________________
parted-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/parted-devel
