From: Davidlohr Bueso <dave@gnu.org>
Date: Mon, 23 Apr 2012 10:40:20 +0000 (+0200)
Subject: fdisk: remove dead code
X-Git-Tag: v2.22-rc1~501
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68c5a7ea7f440e5dd9506356b6c475e9d922a130;p=thirdparty%2Futil-linux.git

fdisk: remove dead code

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index ab4845895c..337e5f7e6a 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -1729,25 +1729,10 @@ static void check_consistency(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
 	}
 }
 
@@ -2966,14 +2951,9 @@ 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
 
 	init_mbr_buffer();