diff options
| -rw-r--r-- | fdisks/fdisk.c | 2 | ||||
| -rw-r--r-- | libfdisk/src/fdiskP.h | 1 | ||||
| -rw-r--r-- | libfdisk/src/label.c | 2 | ||||
| -rw-r--r-- | libfdisk/src/libfdisk.h | 3 | ||||
| -rw-r--r-- | libfdisk/src/partition.c | 28 |
5 files changed, 27 insertions, 9 deletions
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c index db3b29870..3e0d75205 100644 --- a/fdisks/fdisk.c +++ b/fdisks/fdisk.c @@ -193,7 +193,7 @@ void change_partition_type(struct fdisk_context *cxt) _("Type of partition %zu is unchanged: %s."), i + 1, old); - fdisk_free_partition(pa); + fdisk_unref_partition(pa); } void list_disk_geometry(struct fdisk_context *cxt) diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h index 881e1b2b6..2defe3367 100644 --- a/libfdisk/src/fdiskP.h +++ b/libfdisk/src/fdiskP.h @@ -129,6 +129,7 @@ enum { struct fdisk_partition { struct fdisk_context *cxt; + int refcount; size_t partno; uint64_t start; diff --git a/libfdisk/src/label.c b/libfdisk/src/label.c index e243dc05f..db9c40204 100644 --- a/libfdisk/src/label.c +++ b/libfdisk/src/label.c @@ -412,7 +412,7 @@ done: if (org != cols) free(cols); tt_free_table(tb); - fdisk_free_partition(pa); + fdisk_unref_partition(pa); return rc; } diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h index 22741d80f..ef9b1a129 100644 --- a/libfdisk/src/libfdisk.h +++ b/libfdisk/src/libfdisk.h @@ -181,7 +181,8 @@ extern int fdisk_partition_toggle_flag(struct fdisk_context *cxt, size_t partnum extern struct fdisk_partition *fdisk_new_partition(void); extern void fdisk_reset_partition(struct fdisk_partition *pa); -extern void fdisk_free_partition(struct fdisk_partition *pa); +extern void fdisk_ref_partition(struct fdisk_partition *pa); +extern void fdisk_unref_partition(struct fdisk_partition *pa); extern int fdisk_partition_is_freespace(struct fdisk_partition *pa); extern int fdisk_partition_set_start(struct fdisk_partition *pa, uint64_t off); extern uint64_t fdisk_partition_get_start(struct fdisk_partition *pa); diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c index 57c5eb976..3cef46c20 100644 --- a/libfdisk/src/partition.c +++ b/libfdisk/src/partition.c @@ -8,6 +8,7 @@ struct fdisk_partition *fdisk_new_partition(void) { struct fdisk_partition *pa = calloc(1, sizeof(*pa)); + pa->refcount = 1; pa->partno = FDISK_EMPTY_PARTNO; DBG(PART, dbgprint("new %p", pa)); return pa; @@ -15,23 +16,38 @@ struct fdisk_partition *fdisk_new_partition(void) void fdisk_reset_partition(struct fdisk_partition *pa) { + int ref; + if (!pa) return; + + ref = pa->refcount; fdisk_free_parttype(pa->type); free(pa->name); free(pa->uuid); free(pa->attrs); memset(pa, 0, sizeof(*pa)); pa->partno = FDISK_EMPTY_PARTNO; + pa->refcount = ref; } -void fdisk_free_partition(struct fdisk_partition *pa) +void fdisk_ref_partition(struct fdisk_partition *pa) +{ + if (pa) + pa->refcount++; +} + +void fdisk_unref_partition(struct fdisk_partition *pa) { if (!pa) return; - fdisk_reset_partition(pa); - DBG(PART, dbgprint("free %p", pa)); - free(pa); + + pa->refcount--; + if (pa->refcount <= 0) { + fdisk_reset_partition(pa); + DBG(PART, dbgprint("free %p", pa)); + free(pa); + } } int fdisk_partition_set_start(struct fdisk_partition *pa, uint64_t off) @@ -212,13 +228,13 @@ int fdisk_partition_next_partno( * * For exmaple * - * struct fdisk_parition *pa = fdisk_new_partition(); + * struct fdisk_parition *pa; * * fdisk_get_partition(cxt, 0, &pa); * fdisk_partition_to_string(pa, FDISK_COL_UUID, &data); * printf("first partition uuid: %s\n", data); * free(data); - * fdisk_free_partition(pa); + * fdisk_unref_partition(pa); * * returns UUID for the first partition. * |