From 8c0a7f9136ea54d955daee4151004c4476d86f73 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 26 Nov 2013 13:29:23 +0100 Subject: libfdisk: add struct fdisk_partition Signed-off-by: Karel Zak --- libfdisk/src/ask.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libfdisk/src/ask.c') 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; -- cgit v1.2.3-55-g7522