volume_id: disable detection routines which are not setting label and uuid anyway

function                                             old     new   delta
static.warn                                            1       -      -1
static.drive_name_string                              14      12      -2
static.offsets                                         8       -      -8
static.sectors                                        10       -     -10
fs2                                                   60      48     -12
raid2                                                 16       -     -16
uuidcache_init                                       704     677     -27
raid1                                                 32       -     -32
volume_id_probe_all                                  198     158     -40
volume_id_probe_lvm1                                  58       -     -58
volume_id_probe_highpoint_37x_raid                    63       -     -63
volume_id_probe_hpfs                                  67       -     -67
volume_id_probe_minix                                 74       -     -74
volume_id_probe_lvm2                                  78       -     -78
volume_id_probe_silicon_medley_raid                   97       -     -97
volume_id_probe_via_raid                             101       -    -101
volume_id_probe_highpoint_45x_raid                   104       -    -104
volume_id_probe_nvidia_raid                          108       -    -108
volume_id_probe_lsi_mega_raid                        108       -    -108
volume_id_probe_intel_software_raid                  108       -    -108
volume_id_probe_ufs                                  126       -    -126
volume_id_probe_promise_fasttrack_raid               144       -    -144
------------------------------------------------------------------------------
(add/remove: 0/18 grow/shrink: 0/4 up/down: 0/-1384)        Total: -1384 bytes
   text    data     bss     dec     hex filename
 794244     662    7420  802326   c3e16 busybox_old
 792698     662    7420  800780   c380c busybox_unstripped

1 files changed, 0 insertions, 125 deletions

diff --git a/util-linux/volume_id/mac.c b/util-linux/volume_id/mac.c
deleted file mode 100644
index 94a99bee0..000000000
--- a/util-linux/volume_id/mac.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *	This library is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation; either
- *	version 2.1 of the License, or (at your option) any later version.
- *
- *	This library is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *	Lesser General Public License for more details.
- *
- *	You should have received a copy of the GNU Lesser General Public
- *	License along with this library; if not, write to the Free Software
- *	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include "volume_id_internal.h"
-
-struct mac_driver_desc {
-	uint8_t		signature[2];
-	uint16_t	block_size;
-	uint32_t	block_count;
-} __attribute__((__packed__));
-
-struct mac_partition {
-	uint8_t		signature[2];
-	uint16_t	res1;
-	uint32_t	map_count;
-	uint32_t	start_block;
-	uint32_t	block_count;
-	uint8_t		name[32];
-	uint8_t		type[32];
-} __attribute__((__packed__));
-
-int volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off)
-{
-	const uint8_t *buf;
-	struct mac_driver_desc *driver;
-	struct mac_partition *part;
-
-	dbg("probing at offset 0x%llx", (unsigned long long) off);
-
-	buf = volume_id_get_buffer(id, off, 0x200);
-	if (buf == NULL)
-		return -1;
-
-	part = (struct mac_partition *) buf;
-	if ((memcmp(part->signature, "PM", 2) == 0) &&
-	    (memcmp(part->type, "Apple_partition_map", 19) == 0)) {
-		/* linux creates an own subdevice for the map
-		 * just return the type if the drive header is missing */
-		volume_id_set_usage(id, VOLUME_ID_PARTITIONTABLE);
-		id->type = "mac_partition_map";
-		return 0;
-	}
-
-	driver = (struct mac_driver_desc *) buf;
-	if (memcmp(driver->signature, "ER", 2) == 0) {
-		/* we are on a main device, like a CD
-		 * just try to probe the first partition from the map */
-		unsigned bsize = be16_to_cpu(driver->block_size);
-		int part_count;
-		int i;
-
-		/* get first entry of partition table */
-		buf = volume_id_get_buffer(id, off +  bsize, 0x200);
-		if (buf == NULL)
-			return -1;
-
-		part = (struct mac_partition *) buf;
-		if (memcmp(part->signature, "PM", 2) != 0)
-			return -1;
-
-		part_count = be32_to_cpu(part->map_count);
-		dbg("expecting %d partition entries", part_count);
-
-		if (id->partitions != NULL)
-			free(id->partitions);
-		id->partitions =
-			malloc(part_count * sizeof(struct volume_id_partition));
-		if (id->partitions == NULL)
-			return -1;
-		memset(id->partitions, 0x00, sizeof(struct volume_id_partition));
-
-		id->partition_count = part_count;
-
-		for (i = 0; i < part_count; i++) {
-			uint64_t poff;
-			uint64_t plen;
-
-			buf = volume_id_get_buffer(id, off + ((i+1) * bsize), 0x200);
-			if (buf == NULL)
-				return -1;
-
-			part = (struct mac_partition *) buf;
-			if (memcmp(part->signature, "PM", 2) != 0)
-				return -1;
-
-			poff = be32_to_cpu(part->start_block) * bsize;
-			plen = be32_to_cpu(part->block_count) * bsize;
-			dbg("found '%s' partition entry at 0x%llx, len 0x%llx",
-			    part->type, (unsigned long long) poff, (unsigned long long) plen);
-
-			id->partitions[i].off = poff;
-			id->partitions[i].len = plen;
-
-			if (memcmp(part->type, "Apple_Free", 10) == 0) {
-				volume_id_set_usage_part(&id->partitions[i], VOLUME_ID_UNUSED);
-			} else if (memcmp(part->type, "Apple_partition_map", 19) == 0) {
-				volume_id_set_usage_part(&id->partitions[i], VOLUME_ID_PARTITIONTABLE);
-			} else {
-				volume_id_set_usage_part(&id->partitions[i], VOLUME_ID_UNPROBED);
-			}
-		}
-		volume_id_set_usage(id, VOLUME_ID_PARTITIONTABLE);
-		id->type = "mac_partition_map";
-		return 0;
-	}
-
-	return -1;
-}