diff options
| author | Karel Zak | 2014-08-13 23:57:54 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-08-13 23:57:54 +0200 |
| commit | aa36c2cf2cb331c06c1ac5950b3b70ccbf7b0111 (patch) | |
| tree | 1f89cf65567e0b6037984c27c35f64788b796514 /disk-utils/fdisk-menu.c | |
| parent | libfdisk: clean up API (alignment.c) (diff) | |
| download | kernel-qcow2-util-linux-aa36c2cf2cb331c06c1ac5950b3b70ccbf7b0111.tar.gz kernel-qcow2-util-linux-aa36c2cf2cb331c06c1ac5950b3b70ccbf7b0111.tar.xz kernel-qcow2-util-linux-aa36c2cf2cb331c06c1ac5950b3b70ccbf7b0111.zip | |
libfdisk: cleanup fdisk_is_label stuff
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils/fdisk-menu.c')
| -rw-r--r-- | disk-utils/fdisk-menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c index 72f8bbb08..29bc01593 100644 --- a/disk-utils/fdisk-menu.c +++ b/disk-utils/fdisk-menu.c @@ -555,7 +555,7 @@ static int gpt_menu_cb(struct fdisk_context **cxt0, assert(cxt); assert(ent); - assert(fdisk_is_disklabel(cxt, GPT)); + assert(fdisk_is_label(cxt, GPT)); DBG(FRONTEND, ul_debug("enter GPT menu")); @@ -633,7 +633,7 @@ static int dos_menu_cb(struct fdisk_context **cxt0, = fdisk_new_nested_context(cxt, "bsd"); if (!bsd) return -ENOMEM; - if (!fdisk_dev_has_disklabel(bsd)) + if (!fdisk_has_label(bsd)) rc = fdisk_create_disklabel(bsd, "bsd"); if (rc) fdisk_free_context(bsd); @@ -689,7 +689,7 @@ static int sun_menu_cb(struct fdisk_context **cxt0, assert(cxt); assert(ent); - assert(fdisk_is_disklabel(cxt, SUN)); + assert(fdisk_is_label(cxt, SUN)); DBG(FRONTEND, ul_debug("enter SUN menu")); @@ -744,7 +744,7 @@ static int sgi_menu_cb(struct fdisk_context **cxt0, assert(cxt); assert(ent); - assert(fdisk_is_disklabel(cxt, SGI)); + assert(fdisk_is_label(cxt, SGI)); if (ent->expert) return rc; @@ -784,7 +784,7 @@ static int bsd_menu_cb(struct fdisk_context **cxt0, assert(cxt); assert(ent); - assert(fdisk_is_disklabel(cxt, BSD)); + assert(fdisk_is_label(cxt, BSD)); DBG(FRONTEND, ul_debug("enter BSD menu")); |