From: Francesco Cosoleto <cosoleto@gmail.com>
Date: Thu, 15 Dec 2011 19:02:46 +0000 (+0100)
Subject: fdisk: avoid an intermediate variable in command_prompt()
X-Git-Tag: v2.21-rc1~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a96a62a093b1f07164334a5523e5942077a87e7;p=thirdparty%2Futil-linux.git

fdisk: avoid an intermediate variable in command_prompt()

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
---

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 53eed250a3..acf0e673d8 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -1635,6 +1635,9 @@ static void dos_delete_partition(int i)
 static void
 delete_partition(int i)
 {
+	if (i < 0)
+		return;
+
 	if (warn_geometry())
 		return;		/* C/H/S not set */
 
@@ -2869,7 +2872,7 @@ unknown_command(int c) {
 
 static void command_prompt(void)
 {
-	int c, j;
+	int c;
 
 	if (disklabel == OSF_LABEL) {
 		putchar('\n');
@@ -2921,9 +2924,7 @@ static void command_prompt(void)
 				unknown_command(c);
 			break;
 		case 'd':
-			j = get_existing_partition(1, partitions);
-			if (j >= 0)
-				delete_partition(j);
+			delete_partition(get_existing_partition(1, partitions));
 			break;
 		case 'i':
 			if (disklabel == SGI_LABEL)