diff options
| author | Karel Zak | 2014-08-14 00:09:48 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-08-14 00:09:48 +0200 |
| commit | 72d2965c4470b2c740c409db37ed0369bbea98ee (patch) | |
| tree | 89eb051f20aab36349bd77c0515ae335e05b680a /libfdisk/src/label.c | |
| parent | libfdisk: cleanup fdisk_is_label stuff (diff) | |
| download | kernel-qcow2-util-linux-72d2965c4470b2c740c409db37ed0369bbea98ee.tar.gz kernel-qcow2-util-linux-72d2965c4470b2c740c409db37ed0369bbea98ee.tar.xz kernel-qcow2-util-linux-72d2965c4470b2c740c409db37ed0369bbea98ee.zip | |
libfdisk: cleanup label geometry API
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/label.c')
| -rw-r--r-- | libfdisk/src/label.c | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/libfdisk/src/label.c b/libfdisk/src/label.c index 36e4688d9..c69bc170a 100644 --- a/libfdisk/src/label.c +++ b/libfdisk/src/label.c @@ -53,6 +53,19 @@ const char *fdisk_label_get_name(struct fdisk_label *lb) return lb ? lb->name : NULL; } +/** + * fdisk_label_require_geometry: + * @lb: label + * + * Returns: 1 if label requires CHS geometry + */ +int fdisk_label_require_geometry(struct fdisk_label *lb) +{ + assert(lb); + + return lb->flags & FDISK_LABEL_FL_REQUIRE_GEOMETRY ? 1 : 0; +} + /** * fdisk_write_disklabel: @@ -71,29 +84,6 @@ int fdisk_write_disklabel(struct fdisk_context *cxt) return cxt->label->op->write(cxt); } -int fdisk_require_geometry(struct fdisk_context *cxt) -{ - assert(cxt); - - return cxt->label - && cxt->label->flags & FDISK_LABEL_FL_REQUIRE_GEOMETRY ? 1 : 0; -} - -int fdisk_missing_geometry(struct fdisk_context *cxt) -{ - int rc; - - assert(cxt); - - rc = (fdisk_require_geometry(cxt) && - (!cxt->geom.heads || !cxt->geom.sectors - || !cxt->geom.cylinders)); - - if (rc && !fdisk_is_listonly(cxt)) - fdisk_warnx(cxt, _("Incomplete geometry setting.")); - - return rc; -} /** * fdisk_get_fields: |