From 53f21e34a7765c74afab1a8867f4965fb981edb7 Mon Sep 17 00:00:00 2001
From: "\"Robert P. J. Day\"" <rpjday@mindspring.com>
Date: Sat, 1 Jul 2006 14:34:33 +0000
Subject: [PATCH] Remove "#if 0" content.

---
 util-linux/fdisk.c  | 28 ----------------------------
 util-linux/mkswap.c |  4 ----
 2 files changed, 32 deletions(-)

diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index c0828431a..872581ca2 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1443,10 +1443,6 @@ xbsd_initlabel(struct partition *p, struct xbsd_disklabel *d)
 	else
 		d->d_type = BSD_DTYPE_ST506;
 
-#if 0 /* not used (at least not written to disk) by NetBSD/i386 1.0 */
-	d->d_subtype = BSD_DSTYPE_INDOSPART & pindex;
-#endif
-
 #if !defined (__alpha__)
 	d->d_flags = BSD_D_DOSPART;
 #else
@@ -2605,14 +2601,10 @@ sun_autoconfigure_scsi(void)
 	if (!ioctl(fd, SCSI_IOCTL_GET_IDLUN, &id)) {
 		sprintf(buffer,
 			"Host: scsi%d Channel: %02d Id: %02d Lun: %02d\n",
-#if 0
-			((id[0]>>24)&0xff)-/*PROC_SCSI_SCSI+PROC_SCSI_FILE*/33,
-#else
 			/* This is very wrong (works only if you have one HBA),
 			   but I haven't found a way how to get hostno
 			   from the current kernel */
 			0,
-#endif
 			(id[0]>>16) & 0xff,
 			id[0] & 0xff,
 			(id[0]>>8) & 0xff
@@ -4645,25 +4637,10 @@ check_consistency(const struct partition *p, int partition)
 		printf(_("logical=(%d, %d, %d)\n"),lec, leh, les);
 	}
 
-#if 0
-/* Beginning on cylinder boundary? */
-	if (pbh != !pbc || pbs != 1) {
-		printf(_("Partition %i does not start on cylinder "
-			"boundary:\n"), partition + 1);
-		printf(_("     phys=(%d, %d, %d) "), pbc, pbh, pbs);
-		printf(_("should be (%d, %d, 1)\n"), pbc, !pbc);
-	}
-#endif
-
 /* Ending on cylinder boundary? */
 	if (peh != (heads - 1) || pes != sectors) {
 		printf(_("Partition %i does not end on cylinder boundary.\n"),
 			partition + 1);
-#if 0
-		printf(_("     phys=(%d, %d, %d) "), pec, peh, pes);
-		printf(_("should be (%d, %d, %d)\n"),
-		pec, heads - 1, sectors);
-#endif
 	}
 }
 
@@ -5737,14 +5714,9 @@ int fdisk_main(int argc, char **argv)
 		}
 	}
 
-#if 0
-	printf(_("This kernel finds the sector size itself - "
-		 "-b option ignored\n"));
-#else
 	if (user_set_sector_size && argc-optind != 1)
 		printf(_("Warning: the -b (set sector size) option should"
 			 " be used with one specified device\n"));
-#endif
 
 #ifdef CONFIG_FEATURE_FDISK_WRITABLE
 	if (optl) {
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index b48d1f036..986472e92 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -312,9 +312,6 @@ int mkswap_main(int argc, char **argv)
 		PAGES = sz;
 	}
 
-#if 0
-	maxpages = ((version == 0) ? V0_MAX_PAGES : V1_MAX_PAGES);
-#else
 	if (!version)
 		maxpages = V0_MAX_PAGES;
 	else if (get_linux_version_code() >= KERNEL_VERSION(2,2,1))
@@ -324,7 +321,6 @@ int mkswap_main(int argc, char **argv)
 		if (maxpages > V1_MAX_PAGES)
 			maxpages = V1_MAX_PAGES;
 	}
-#endif
 	if (PAGES > maxpages) {
 		PAGES = maxpages;
 		bb_error_msg("warning: truncating swap area to %ldkB",