From: Francesco Cosoleto <cosoleto@gmail.com>
Date: Mon, 28 Feb 2011 11:16:40 +0000 (+0100)
Subject: cfdisk: move "No more partition" warning to draw_cursor()
X-Git-Tag: v2.20-rc1~461
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3697ae954cc7755246bb1837d0b7c81c8f4db23;p=thirdparty%2Futil-linux.git

cfdisk: move "No more partition" warning to draw_cursor()

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

diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index 71ce9f6625..f03064e54b 100644
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -2536,10 +2536,12 @@ draw_screen(void) {
     free(line);
 }
 
-static int
+static void
 draw_cursor(int move) {
-    if (move != 0 && (cur_part + move < 0 || cur_part + move >= num_parts))
-	return -1;
+    if (move != 0 && (cur_part + move < 0 || cur_part + move >= num_parts)) {
+	print_warning(_("No more partitions"));
+	return;
+    }
 
     if (arrow_cursor)
 	mvaddstr(DISK_TABLE_START + cur_part + 2
@@ -2561,8 +2563,6 @@ draw_cursor(int move) {
 	draw_partition(cur_part);
 	standend();
     }
-
-    return 0;
 }
 
 static void
@@ -2607,7 +2607,7 @@ do_curses_fdisk(void) {
     while (!done) {
 	char *s;
 
-	(void)draw_cursor(0);
+	draw_cursor(0);
 
 	if (p_info[cur_part].id == FREE_SPACE) {
 	    s = ((opentype == O_RDWR) ? "hnpquW" : "hnpqu");
@@ -2712,16 +2712,10 @@ do_curses_fdisk(void) {
 	    draw_screen();
 	    break;
 	case MENU_UP : /* Up arrow */
-	    if (!draw_cursor(-1))
-		command = 0;
-	    else
-		print_warning(_("No more partitions"));
+	    draw_cursor(-1);
 	    break;
 	case MENU_DOWN : /* Down arrow */
-	    if (!draw_cursor(1))
-		command = 0;
-	    else
-		print_warning(_("No more partitions"));
+	    draw_cursor(1);
 	    break;
 	case REDRAWKEY:
 	    clear();