summaryrefslogtreecommitdiffstats
path: root/fdisks/fdisk-menu.c
diff options
context:
space:
mode:
authorKarel Zak2013-12-18 10:38:43 +0100
committerKarel Zak2014-03-11 11:35:13 +0100
commit9f670072f42d7e0e8403385defc69e93b636cb93 (patch)
tree05a7ba02cbbe607874f09fde3af3f9e53475bc05 /fdisks/fdisk-menu.c
parentlibfdisk: use fdisk_table to generate output (diff)
downloadkernel-qcow2-util-linux-9f670072f42d7e0e8403385defc69e93b636cb93.tar.gz
kernel-qcow2-util-linux-9f670072f42d7e0e8403385defc69e93b636cb93.tar.xz
kernel-qcow2-util-linux-9f670072f42d7e0e8403385defc69e93b636cb93.zip
libfdisk: remove tt stuff from API
The include/tt.h has to be used only internally by the library (for example to convert fdisk_table to string). The fdisk_ask API should not be more used for complex tasks like print partition table. The application has to use fdisk_get_table() and fdisk_table_to_string() or something else. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk-menu.c')
-rw-r--r--fdisks/fdisk-menu.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/fdisks/fdisk-menu.c b/fdisks/fdisk-menu.c
index ced819aaf..d7b852deb 100644
--- a/fdisks/fdisk-menu.c
+++ b/fdisks/fdisk-menu.c
@@ -210,7 +210,6 @@ struct menu menu_dos = {
MENU_ENT('c', N_("toggle the dos compatibility flag")),
MENU_XENT('b', N_("move beginning of data in a partition")),
- MENU_XENT('e', N_("list extended partitions")),
MENU_XENT('f', N_("fix partition order")),
MENU_XENT('i', N_("change the disk identifier")),
@@ -445,7 +444,7 @@ static int generic_menu_cb(struct fdisk_context **cxt0,
switch (ent->key) {
case 'p':
list_disk_geometry(cxt);
- rc = fdisk_list_disklabel(cxt);
+ list_disklabel(cxt);
break;
case 'w':
rc = fdisk_write_disklabel(cxt);
@@ -655,9 +654,6 @@ static int dos_menu_cb(struct fdisk_context **cxt0,
rc = fdisk_dos_move_begin(cxt, n);
break;
}
- case 'e':
- rc = fdisk_dos_list_extended(cxt);
- break;
case 'f':
rc = fdisk_dos_fix_order(cxt);
break;
@@ -799,7 +795,7 @@ static int bsd_menu_cb(struct fdisk_context **cxt0,
org = fdisk_context_display_details(cxt);
fdisk_context_enable_details(cxt, 1);
- fdisk_list_disklabel(cxt);
+ list_disklabel(cxt);
fdisk_context_enable_details(cxt, org);
break;
case 'x':