diff options
| author | Jim Meyering <meyering@redhat.com> | 2010-02-20 12:44:47 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2010-02-20 12:44:47 +0100 |
| commit | 66df8b2ce2f596e7c446c08d9874cce5700555fd (patch) | |
| tree | acd27802b75ca1eee713698bbd9a2f11b3cd763d /libparted/labels/sun.c | |
| parent | f65304f3cff63b4759c6f783adf1fe41688fe776 (diff) | |
| download | parted-66df8b2ce2f596e7c446c08d9874cce5700555fd.tar.gz | |
maint: remove now-unused <partition_table_type>_clobber functions
All of these functions were rendered unused by commit 376b143045,
"ped_disk_clobber: change semantics" on 2009-11-13.
Also, Update each <...>_disk_ops "clobber:" member to be NULL.
* libparted/labels/aix.c (aix_clobber): Remove function.
* libparted/labels/bsd.c (bsd_clobber): Likewise.
* libparted/labels/dasd.c (dasd_clobber): Likewise.
* libparted/labels/dos.c (msdos_clobber): Likewise.
* libparted/labels/dvh.c (dvh_clobber): Likewise.
* libparted/labels/gpt.c (gpt_clobber): Likewise.
* libparted/labels/loop.c (loop_clobber): Likewise.
* libparted/labels/mac.c (_clobber_part_map, mac_clobber): Likewise.
* libparted/labels/pc98.c (pc98_clobber): Likewise.
* libparted/labels/rdb.c (amiga_clobber): Likewise.
* libparted/labels/sun.c (sun_clobber): Likewise.
Suggested by Hans De Goede.
Diffstat (limited to 'libparted/labels/sun.c')
| -rw-r--r-- | libparted/labels/sun.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/libparted/labels/sun.c b/libparted/labels/sun.c index 0528e2c..9aeddcf 100644 --- a/libparted/labels/sun.c +++ b/libparted/labels/sun.c @@ -157,25 +157,6 @@ sun_probe (const PedDevice *dev) return ok; } -#ifndef DISCOVER_ONLY -static int -sun_clobber (PedDevice* dev) -{ - PED_ASSERT (dev != NULL, return 0); - PED_ASSERT (sun_probe (dev), return 0); - - void *s0; - if (!ptt_read_sector (dev, 0, &s0)) - return 0; - - SunRawLabel *table = s0; - table->magic = 0; - int write_ok = ped_device_write (dev, (void*) table, 0, 1); - free (s0); - return write_ok; -} -#endif /* !DISCOVER_ONLY */ - static PedDisk* sun_alloc (const PedDevice* dev) { @@ -921,7 +902,7 @@ error: PT_define_limit_functions (sun) static PedDiskOps sun_disk_ops = { - clobber: NULL_IF_DISCOVER_ONLY (sun_clobber), + clobber: NULL, write: NULL_IF_DISCOVER_ONLY (sun_write), disk_set_flag: sun_disk_set_flag, |