libfdisk: cleanup partno API

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

diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h
index 7822466a22b0d0051dc6bf55e489b1ae3b17ab4d..7915e5cf02ce7fd5c8d422d473701530ae3b912d 100644 (file)
--- a/libfdisk/src/fdiskP.h
+++ b/libfdisk/src/fdiskP.h
@@ -377,6 +377,11 @@ struct fdisk_context {
        struct fdisk_script     *script;        /* what we want to follow */
 };
 
+/* partition.c */
+int fdisk_partition_next_partno(struct fdisk_partition *pa,
+                                      struct fdisk_context *cxt,
+                                      size_t *n);
+
 /* context.c */
 extern int __fdisk_switch_label(struct fdisk_context *cxt,
                                    struct fdisk_label *lb);

diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h
index 260f9083944f628562a379746b12927d5814724b..92f641678502c533fc576e983f3d66af41f5e569 100644 (file)
--- a/libfdisk/src/libfdisk.h
+++ b/libfdisk/src/libfdisk.h
@@ -262,10 +262,14 @@ uint64_t fdisk_partition_get_size(struct fdisk_partition *pa);
 int fdisk_partition_has_size(struct fdisk_partition *pa);
 int fdisk_partition_size_explicit(struct fdisk_partition *pa, int enable);
 
-extern int fdisk_partition_set_partno(struct fdisk_partition *pa, size_t n);
-extern size_t fdisk_partition_get_partno(struct fdisk_partition *pa);
-extern int fdisk_partition_cmp_partno(struct fdisk_partition *a,
-                             struct fdisk_partition *b);
+int fdisk_partition_set_partno(struct fdisk_partition *pa, size_t num);
+int fdisk_partition_unset_partno(struct fdisk_partition *pa);
+size_t fdisk_partition_get_partno(struct fdisk_partition *pa);
+int fdisk_partition_has_partno(struct fdisk_partition *pa);
+int fdisk_partition_cmp_partno(struct fdisk_partition *a,
+                                      struct fdisk_partition *b);
+int fdisk_partition_partno_follow_default(struct fdisk_partition *pa, int enable);
+
 
 extern int fdisk_partition_set_type(struct fdisk_partition *pa, const struct fdisk_parttype *type);
 extern const struct fdisk_parttype *fdisk_partition_get_type(struct fdisk_partition *pa);
@@ -284,11 +288,10 @@ extern int fdisk_partition_to_string(struct fdisk_partition *pa,
                                     struct fdisk_context *cxt,
                                     int id, char **data);
 
-extern int fdisk_partition_next_partno(struct fdisk_partition *pa,
+int fdisk_partition_next_partno(struct fdisk_partition *pa,
                                       struct fdisk_context *cxt,
                                       size_t *n);
 
-extern int fdisk_partition_partno_follow_default(struct fdisk_partition *pa, int enable);
 extern int fdisk_partition_end_follow_default(struct fdisk_partition *pa, int enable);
 extern int fdisk_partition_end_is_default(struct fdisk_partition *pa);
 

diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c
index e510c649d952aa247d14c20d87b8b3a7e2681e3d..d63dae03e630d3276d66dbddfe0962356480020e 100644 (file)
--- a/libfdisk/src/partition.c
+++ b/libfdisk/src/partition.c
@@ -286,36 +286,103 @@ int fdisk_partition_size_explicit(struct fdisk_partition *pa, int enable)
        return 0;
 }
 
+/**
+ * fdisk_partition_set_partno:
+ * @pa: partition
+ * @parto: partitin number (0 is the first partition, maximal is SIZE_MAX-1)
+ *
+ * Note that zero is valid partno too. Use fdisk_partition_unset_partno() to
+ * undefine the partno.
+ *
+ * Returns: 0 on success, <0 on error.
+ */
+int fdisk_partition_set_partno(struct fdisk_partition *pa, size_t num)
+{
+       if (!pa)
+               return -EINVAL;
+       if (FDISK_IS_UNDEF(num))
+               return -ERANGE;
+       pa->partno = num;
+       return 0;
+}
 
 /**
- * fdisk_partition_set_partno
+ * fdisk_partition_unset_partno:
  * @pa: partition
- * @n: partition number
  *
- * When @pa used as a tempalate for fdisk_add_partition() when infor label driver 
- * about wanted partition position.
+ * Sets the partno as undefined. See fdisk_partition_has_partno().
  *
  * Returns: 0 on success, <0 on error.
  */
-int fdisk_partition_set_partno(struct fdisk_partition *pa, size_t n)
+int fdisk_partition_unset_partno(struct fdisk_partition *pa)
 {
        if (!pa)
                return -EINVAL;
-       pa->partno = n;
+       FDISK_INIT_UNDEF(pa->partno);
        return 0;
 }
 
+/**
+ * fdisk_partition_get_partno:
+ * @pa: partition
+ *
+ * The zero is also valid parition number. The function may return random
+ * value when partno is undefined (for example after fdisk_partition_unset_partno()).
+ * Always use fdisk_partition_has_partno() to be sure that you work with valid
+ * numbers.
+ *
+ * Returns: partition number (0 is the first partition)
+ */
 size_t fdisk_partition_get_partno(struct fdisk_partition *pa)
 {
-       return pa ? pa->partno : (size_t) -1;
+       return pa->partno;
 }
 
+/**
+ * fdisk_partition_has_partno:
+ * @pa: partition
+ *
+ * Returns: 1 or 0
+ */
+int fdisk_partition_has_partno(struct fdisk_partition *pa)
+{
+       return pa && !FDISK_IS_UNDEF(pa->partno);
+}
+
+
+/**
+ * fdisk_partition_cmp_partno:
+ * @a: partition
+ * @b: partition
+ *
+ * Compares partitons according to partition number See fdisk_sort_table().
+ *
+ * Return: 0 if the same, <0 if @b greater, >0 if @a greater.
+ */
 int fdisk_partition_cmp_partno(struct fdisk_partition *a,
                               struct fdisk_partition *b)
 {
        return a->partno - b->partno;
 }
 
+/**
+ * fdisk_partition_partno_follow_default
+ * @pa: partition
+ * @enable: 0|1
+ *
+ * When @pa used as a tempalate for fdisk_add_partition() when force label driver
+ * to add a new partition to the default (next) position.
+ *
+ * Returns: 0 on success, <0 on error.
+ */
+int fdisk_partition_partno_follow_default(struct fdisk_partition *pa, int enable)
+{
+       if (!pa)
+               return -EINVAL;
+       pa->partno_follow_default = enable ? 1 : 0;
+       return 0;
+}
+
 int fdisk_partition_set_type(struct fdisk_partition *pa,
                             const struct fdisk_parttype *type)
 {
@@ -368,27 +435,10 @@ int fdisk_partition_set_uuid(struct fdisk_partition *pa, const char *uuid)
        return 0;
 }
 
-/**
- * fdisk_partition_partno_follow_default
- * @pa: partition
- * @enable: 0|1
- *
- * When @pa used as a tempalate for fdisk_add_partition() when force label driver
- * to add a new partition to the default (next) position.
- *
- * Returns: 0 on success, <0 on error.
- */
-int fdisk_partition_partno_follow_default(struct fdisk_partition *pa, int enable)
-{
-       if (!pa)
-               return -EINVAL;
-       pa->partno_follow_default = enable ? 1 : 0;
-       return 0;
-}
 
 
 /**
- * fdisk_partition_start_follow_default
+ * fdisk_partition_end_follow_default
  * @pa: partition
  * @enable: 0|1
  *
@@ -498,7 +548,7 @@ int fdisk_partition_next_partno(
                }
                return -ERANGE;
 
-       } else if (pa && !FDISK_IS_UNDEF(pa->partno)) {
+       } else if (pa && fdisk_partition_has_partno(pa)) {
 
                DBG(PART, ul_debugobj(pa, "next partno (specified=%zu)", pa->partno));
 
@@ -550,13 +600,16 @@ int fdisk_partition_to_string(struct fdisk_partition *pa,
        case FDISK_FIELD_DEVICE:
                if (pa->freespace)
                        p = strdup(_("Free space"));
-               else if (cxt->label->flags & FDISK_LABEL_FL_INCHARS_PARTNO)
-                       rc = asprintf(&p, "%c", (int) pa->partno + 'a');
-               else
-                       p = fdisk_partname(cxt->dev_path, pa->partno + 1);
+               else if (fdisk_partition_has_partno(pa) && cxt->dev_path) {
+                       if (cxt->label->flags & FDISK_LABEL_FL_INCHARS_PARTNO)
+                               rc = asprintf(&p, "%c", (int) pa->partno + 'a');
+                       else
+                               p = fdisk_partname(cxt->dev_path, pa->partno + 1);
+               }
                break;
        case FDISK_FIELD_BOOT:
-               rc = asprintf(&p, "%c", pa->boot ? '*' : ' ');
+               if (fdisk_partition_is_bootable(pa))
+                       rc = asprintf(&p, "%c", pa->boot ? '*' : ' ');
                break;
        case FDISK_FIELD_START:
                if (fdisk_partition_has_start(pa)) {
@@ -644,13 +697,15 @@ int fdisk_partition_to_string(struct fdisk_partition *pa,
 /**
  * fdisk_get_partition:
  * @cxt: context
- * @partno: partition nuymber
+ * @partno: partition number (0 is the first partition)
  * @pa: returns data about partition
  *
- * Fills in @pa with data about partition @n. Note that partno may address
- * unused partition and then this function does not fill anything to @pa.
- * See fdisk_is_partition_used(). If @pa points to NULL then the function
- * allocates a newly allocated fdisk_partition struct.
+ * Reads disklabel and fills in @pa with data about partition @n.
+ *
+ * Note that partno may address unused partition and then this function does
+ * not fill anything to @pa.  See fdisk_is_partition_used(). If @pa points to
+ * NULL then the function allocates a newly allocated fdisk_partition struct,
+ * use fdisk_unref_partition() to deallocate.
  *
  * Returns: 0 on success, otherwise, a corresponding error.
  */
@@ -691,9 +746,11 @@ int fdisk_get_partition(struct fdisk_context *cxt, size_t partno,
 /**
  * fdisk_set_partition:
  * @cxt: context
- * @partno: partition nuymber
+ * @partno: partition number (0 is the first partition)
  * @pa: new partition setting
  *
+ * Modifies disklabel according to setting with in @pa.
+ *
  * Returns: 0 on success, <0 on error.
  */
 int fdisk_set_partition(struct fdisk_context *cxt, size_t partno,
@@ -726,9 +783,9 @@ int fdisk_set_partition(struct fdisk_context *cxt, size_t partno,
  * If @pa is not specified or any @pa item is missiong the libfdisk will ask by
  * fdisk_ask_ API.
  *
- * Creates a new partition.
+ * Adds a new partition to disklabel.
  *
- * Returns: 0 on success,  <0 on error.
+ * Returns: 0 on success, <0 on error.
  */
 int fdisk_add_partition(struct fdisk_context *cxt,
                        struct fdisk_partition *pa,
@@ -768,9 +825,9 @@ int fdisk_add_partition(struct fdisk_context *cxt,
 /**
  * fdisk_delete_partition:
  * @cxt: fdisk context
- * @partno: partition number to delete
+ * @partno: partition number to delete (0 is the first partition)
  *
- * Deletes a @partno partition.
+ * Deletes a @partno partition from disklabel.
  *
  * Returns: 0 on success, <0 on error
  */
@@ -790,7 +847,7 @@ int fdisk_delete_partition(struct fdisk_context *cxt, size_t partno)
  * fdisk_delete_all_partitions:
  * @cxt: fdisk context
  *
- * Delete all used partitions.
+ * Delete all used partitions from disklabel.
  *
  * Returns: 0 on success, otherwise, a corresponding error.
  */
@@ -814,8 +871,13 @@ int fdisk_delete_all_partitions(struct fdisk_context *cxt)
        return rc;
 }
 
-/*
- * This is faster than fdisk_get_partition() + fdisk_partition_is_used()
+/**
+ * fdisk_is_partition_used:
+ * @n: partition number (0 is the first partition)
+ *
+ * This is faster than fdisk_get_partition() + fdisk_partition_is_used().
+ *
+ * Returns: 0 or 1
  */
 int fdisk_is_partition_used(struct fdisk_context *cxt, size_t n)
 {

diff --git a/libfdisk/src/table.c b/libfdisk/src/table.c
index ea392d900e0d7c8df41f0072bb06be27241427cc..91ccaac9162272aa354ec5ad805604ed8958fb52 100644 (file)
--- a/libfdisk/src/table.c
+++ b/libfdisk/src/table.c
@@ -369,8 +369,10 @@ static int table_add_freespace(
        if (!pa)
                return 0;
        fdisk_reset_iter(&itr, FDISK_ITER_FORWARD);
-       if (parent) {
+       if (parent && fdisk_partition_has_partno(parent)) {
                while (fdisk_table_next_partition(tb, &itr, &x) == 0) {
+                       if (!fdisk_partition_has_partno(pa))
+                               continue;
                        if (x->partno == parent->partno) {
                                real_parent = x;
                                break;