summaryrefslogtreecommitdiff
path: root/libparted/labels/mac.c
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2010-02-20 12:44:47 +0100
committerJim Meyering <meyering@redhat.com>2010-02-20 12:44:47 +0100
commit66df8b2ce2f596e7c446c08d9874cce5700555fd (patch)
treeacd27802b75ca1eee713698bbd9a2f11b3cd763d /libparted/labels/mac.c
parentf65304f3cff63b4759c6f783adf1fe41688fe776 (diff)
downloadparted-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/mac.c')
-rw-r--r--libparted/labels/mac.c53
1 files changed, 1 insertions, 52 deletions
diff --git a/libparted/labels/mac.c b/libparted/labels/mac.c
index 19de261..49a236e 100644
--- a/libparted/labels/mac.c
+++ b/libparted/labels/mac.c
@@ -353,57 +353,6 @@ mac_free (PedDisk* disk)
free (mac_disk_data);
}
-#ifndef DISCOVER_ONLY
-static int
-_clobber_part_map (PedDevice* dev)
-{
- void *buf = ped_malloc (dev->sector_size);
- if (!buf)
- return 0;
-
- int ok = 1;
- PedSector sector;
- for (sector=1; 1; sector++) {
- if (!ped_device_read (dev, buf, sector, 1)) {
- ok = 0;
- break;
- }
- if (!_rawpart_check_signature (buf)) {
- ok = 1;
- break;
- }
- memset (buf, 0, dev->sector_size);
- if (!ped_device_write (dev, buf, sector, 1)) {
- ok = 0;
- break;
- }
- }
- free (buf);
- return ok;
-}
-
-static int
-mac_clobber (PedDevice* dev)
-{
- void *buf;
- if (!ptt_read_sector (dev, 0, &buf))
- return 0;
-
- if (!_check_signature (buf)) {
- free (buf);
- return 0;
- }
-
- memset (buf, 0, dev->sector_size);
- int ok = ped_device_write (dev, buf, 0, 1);
- free (buf);
- if (!ok)
- return 0;
-
- return _clobber_part_map (dev);
-}
-#endif /* !DISCOVER_ONLY */
-
static int
_rawpart_cmp_type (const MacRawPartition* raw_part, const char* type)
{
@@ -1634,7 +1583,7 @@ mac_get_max_supported_partition_count (const PedDisk* disk, int *max_n)
PT_define_limit_functions (mac)
static PedDiskOps mac_disk_ops = {
- clobber: NULL_IF_DISCOVER_ONLY (mac_clobber),
+ clobber: NULL,
/* FIXME: remove this cast, once mac_write is fixed not to
modify its *DISK parameter. */
write: NULL_IF_DISCOVER_ONLY ((int (*) (const PedDisk*)) mac_write),