diff options
| author | Karel Zak | 2017-07-19 15:09:12 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-07-19 15:09:12 +0200 |
| commit | 264ef9875a776bf9c422c83a9611c8df749af8e8 (patch) | |
| tree | 939a383d601dcf9190d80e4a7054b27f063c8970 /libfdisk | |
| parent | cfdisk: add resize function (diff) | |
| download | kernel-qcow2-util-linux-264ef9875a776bf9c422c83a9611c8df749af8e8.tar.gz kernel-qcow2-util-linux-264ef9875a776bf9c422c83a9611c8df749af8e8.tar.xz kernel-qcow2-util-linux-264ef9875a776bf9c422c83a9611c8df749af8e8.zip | |
libfdisk: improve table print debugs
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk')
| -rw-r--r-- | libfdisk/src/fdiskP.h | 2 | ||||
| -rw-r--r-- | libfdisk/src/table.c | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h index 77ad7610d..1796e18e1 100644 --- a/libfdisk/src/fdiskP.h +++ b/libfdisk/src/fdiskP.h @@ -424,6 +424,8 @@ enum { extern int fdisk_diff_tables(struct fdisk_table *a, struct fdisk_table *b, struct fdisk_iter *itr, struct fdisk_partition **res, int *change); +extern void fdisk_debug_print_table(struct fdisk_table *tb); + /* context.c */ extern int __fdisk_switch_label(struct fdisk_context *cxt, diff --git a/libfdisk/src/table.c b/libfdisk/src/table.c index 903778426..c5ad382ca 100644 --- a/libfdisk/src/table.c +++ b/libfdisk/src/table.c @@ -331,18 +331,21 @@ int fdisk_get_partitions(struct fdisk_context *cxt, struct fdisk_table **tb) return 0; } -static void debug_print_table(struct fdisk_table *tb) +void fdisk_debug_print_table(struct fdisk_table *tb) { struct fdisk_iter itr; struct fdisk_partition *pa; fdisk_reset_iter(&itr, FDISK_ITER_FORWARD); while (fdisk_table_next_partition(tb, &itr, &pa) == 0) - ul_debugobj(tb, "partition %p [partno=%zu, start=%ju, end=%ju, size=%ju] ", + ul_debugobj(tb, "partition %p [partno=%zu, start=%ju, end=%ju, size=%ju%s%s%s] ", pa, pa->partno, (uintmax_t) fdisk_partition_get_start(pa), (uintmax_t) fdisk_partition_get_end(pa), - (uintmax_t) fdisk_partition_get_size(pa)); + (uintmax_t) fdisk_partition_get_size(pa), + fdisk_partition_is_nested(pa) ? " nested" : "", + fdisk_partition_is_freespace(pa) ? " freespace" : "", + fdisk_partition_is_container(pa) ? " container" : ""); } @@ -376,13 +379,17 @@ int fdisk_table_sort_partitions(struct fdisk_table *tb, if (!tb) return -EINVAL; + /* DBG(TAB, ul_debugobj(tb, "Before sort:")); - ON_DBG(TAB, debug_print_table(tb)); + ON_DBG(TAB, fdisk_debug_print_table(tb)); + */ list_sort(&tb->parts, cmp_parts_wrapper, (void *) cmp); + /* DBG(TAB, ul_debugobj(tb, "After sort:")); - ON_DBG(TAB, debug_print_table(tb)); + ON_DBG(TAB, fdisk_debug_print_table(tb)); + */ return 0; } |