summaryrefslogtreecommitdiffstats
path: root/libfdisk/src/ask.c
diff options
context:
space:
mode:
authorKarel Zak2013-11-26 13:29:23 +0100
committerKarel Zak2014-03-11 11:35:12 +0100
commit8c0a7f9136ea54d955daee4151004c4476d86f73 (patch)
treea7de504075af6879b628be11e86b6b23f61e74e6 /libfdisk/src/ask.c
parentlib/tt: add reduce term width functionality (diff)
downloadkernel-qcow2-util-linux-8c0a7f9136ea54d955daee4151004c4476d86f73.tar.gz
kernel-qcow2-util-linux-8c0a7f9136ea54d955daee4151004c4476d86f73.tar.xz
kernel-qcow2-util-linux-8c0a7f9136ea54d955daee4151004c4476d86f73.zip
libfdisk: add struct fdisk_partition
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/ask.c')
-rw-r--r--libfdisk/src/ask.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c
index 8a5174c7e..872c8da38 100644
--- a/libfdisk/src/ask.c
+++ b/libfdisk/src/ask.c
@@ -302,12 +302,9 @@ int fdisk_ask_partnum(struct fdisk_context *cxt, size_t *partnum, int wantnew)
ask->data.num.inchars = inchar ? 1 : 0;
for (i = 0; i < cxt->label->nparts_max; i++) {
- int status = 0;
+ int used = fdisk_is_partition_used(cxt, i);
- rc = fdisk_partition_get_status(cxt, i, &status);
- if (rc)
- break;
- if (wantnew && !(status & FDISK_PARTSTAT_USED)) {
+ if (wantnew && !used) {
ptr = mk_string_list(ptr, &len, &begin, &run, i, inchar);
if (!ptr) {
rc = -EINVAL;
@@ -316,7 +313,7 @@ int fdisk_ask_partnum(struct fdisk_context *cxt, size_t *partnum, int wantnew)
if (!num->low)
num->dfl = num->low = i + 1;
num->hig = i + 1;
- } else if (!wantnew && (status & FDISK_PARTSTAT_USED)) {
+ } else if (!wantnew && used) {
ptr = mk_string_list(ptr, &len, &begin, &run, i, inchar);
if (!num->low)
num->low = i + 1;