libfdisk: fdisk_label_is_labeltype()

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
index 48dfe85cafec9dd1dc398f00b0154e4cd25b7922..320b40b9b9deebd1ce773cd078669b10cdfb2316 100644 (file)
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
@@ -252,15 +252,15 @@ int fdisk_has_label(struct fdisk_context *cxt)
 /**
  * fdisk_is_labeltype:
  * @cxt: fdisk context
- * @l: disklabel type
+ * @l: FDISK_DISKLABEL_*
  *
  * See also fdisk_is_label() macro in libfdisk.h.
- * 
- * Returns: return 1 if there is @l disklabel on the device.
+ *
+ * Returns: return 1 if the current label is @l
  */
 int fdisk_is_labeltype(struct fdisk_context *cxt, enum fdisk_labeltype l)
 {
-       return cxt && cxt->label && cxt->label->id == l;
+       return cxt && fdisk_label_is_labeltype(cxt->label, l);
 }
 
 static void reset_context(struct fdisk_context *cxt)

diff --git a/libfdisk/src/label.c b/libfdisk/src/label.c
index 4e37f74f99d8fb027394131699a32967194596b7..a2fa93bc65bf1c605f42bec6ff5758c5a6382868 100644 (file)
--- a/libfdisk/src/label.c
+++ b/libfdisk/src/label.c
@@ -70,6 +70,18 @@ const char *fdisk_label_get_name(struct fdisk_label *lb)
        return lb ? lb->name : NULL;
 }
 
+/**
+ * fdisk_label_is_labeltype:
+ * @lb: label
+ * @id: FDISK_DISKLABEL_*
+ *
+ * Returns: 1 if the label type matches with id.
+ */
+int fdisk_label_is_labeltype(struct fdisk_label *lb, enum fdisk_labeltype id)
+{
+       return lb && lb->id == id;
+}
+
 /**
  * fdisk_label_require_geometry:
  * @lb: label

diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h
index c63060c14e10bbf395eef44db9ebfa8ba1233ce1..beb8422945d062fceacd7039eb5e7d5af8bc9899 100644 (file)
--- a/libfdisk/src/libfdisk.h
+++ b/libfdisk/src/libfdisk.h
@@ -169,6 +169,7 @@ enum {
        FDISK_FIELD_UUID,
 };
 
+int fdisk_label_is_labeltype(struct fdisk_label *lb, enum fdisk_labeltype id);
 const char *fdisk_label_get_name(struct fdisk_label *lb);
 int fdisk_label_require_geometry(struct fdisk_label *lb);