Skip to content

Commit

Permalink
snapshots: remove space after the last partition
Browse files Browse the repository at this point in the history
  • Loading branch information
@7Ji
7Ji committed Nov 10, 2022
1 parent a145b79 commit bd4409b
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 9 deletions.
24 changes: 18 additions & 6 deletions src/dtb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,13 +656,17 @@ dtb_snapshot_decimal(
struct dts_partition_entry const *const part_start = phelper->partitions;
struct dts_partition_entry const *part_current;
uint32_t const pcount = util_safe_partitions_count(phelper->partitions_count);
uint32_t const pcount_has_space = pcount - 1;
fputs("DTB snapshot decimal:\n", stderr);
for (unsigned i = 0; i < pcount; ++i) {
part_current = part_start + i;
if (part_current->size == (uint64_t)-1) {
printf("%s::-1:%u ", part_current->name, part_current->mask);
printf("%s::-1:%u", part_current->name, part_current->mask);
} else {
printf("%s::%lu:%u ", part_current->name, part_current->size, part_current->mask);
printf("%s::%lu:%u", part_current->name, part_current->size, part_current->mask);
}
if (i != pcount_has_space) {
fputc(' ', stdout);
}
}
putc('\n', stdout);
Expand All @@ -676,13 +680,17 @@ dtb_snapshot_hex(
struct dts_partition_entry const *const part_start = phelper->partitions;
struct dts_partition_entry const *part_current;
uint32_t const pcount = util_safe_partitions_count(phelper->partitions_count);
uint32_t const pcount_has_space = pcount - 1;
fputs("DTB snapshot hex:\n", stderr);
for (unsigned i = 0; i < pcount; ++i) {
part_current = part_start + i;
if (part_current->size == (uint64_t)-1) {
printf("%s::-1:%u ", part_current->name, part_current->mask);
printf("%s::-1:%u", part_current->name, part_current->mask);
} else {
printf("%s::0x%lx:%u ", part_current->name, part_current->size, part_current->mask);
printf("%s::0x%lx:%u", part_current->name, part_current->size, part_current->mask);
}
if (i != pcount_has_space) {
fputc(' ', stdout);
}
}
putc('\n', stdout);
Expand All @@ -697,15 +705,19 @@ dtb_snapshot_human(
struct dts_partition_entry const *const part_start = phelper->partitions;
struct dts_partition_entry const *part_current;
uint32_t const pcount = util_safe_partitions_count(phelper->partitions_count);
uint32_t const pcount_has_space = pcount - 1;
size_t size;
char suffix;
for (unsigned i = 0; i < pcount; ++i) {
part_current = part_start + i;
if (part_current->size == (uint64_t)-1) {
printf("%s::-1:%u ", part_current->name, part_current->mask);
printf("%s::-1:%u", part_current->name, part_current->mask);
} else {
size = util_size_to_human_readable_int(part_current->size, &suffix);
printf("%s::%lu%c:%u ", part_current->name, size, suffix, part_current->mask);
printf("%s::%lu%c:%u", part_current->name, size, suffix, part_current->mask);
}
if (i != pcount_has_space) {
fputc(' ', stdout);
}
}
putc('\n', stdout);
Expand Down
18 changes: 15 additions & 3 deletions src/ept.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,9 +671,13 @@ ept_snapshot_decimal(
struct ept_partition const *const part_start = table->partitions;
struct ept_partition const *part_current;
uint32_t const pcount = util_safe_partitions_count(table->partitions_count);
uint32_t const pcount_has_space = pcount - 1;
for (uint32_t i = 0; i < pcount; ++i) {
part_current = part_start + i;
printf("%s:%lu:%lu:%u ", part_current->name, part_current->offset, part_current->size, part_current->mask_flags);
printf("%s:%lu:%lu:%u", part_current->name, part_current->offset, part_current->size, part_current->mask_flags);
if (i != pcount_has_space) {
fputc(' ', stdout);
}
}
fputc('\n', stdout);
}
Expand All @@ -687,9 +691,13 @@ ept_snapshot_hex(
struct ept_partition const *const part_start = table->partitions;
struct ept_partition const *part_current;
uint32_t const pcount = util_safe_partitions_count(table->partitions_count);
uint32_t const pcount_has_space = pcount - 1;
for (uint32_t i = 0; i < pcount; ++i) {
part_current = part_start + i;
printf("%s:0x%lx:0x%lx:%u ", part_current->name, part_current->offset, part_current->size, part_current->mask_flags);
printf("%s:0x%lx:0x%lx:%u", part_current->name, part_current->offset, part_current->size, part_current->mask_flags);
if (i != pcount_has_space) {
fputc(' ', stdout);
}
}
fputc('\n', stdout);
}
Expand All @@ -707,11 +715,15 @@ ept_snapshot_human(
size_t size;
char suffix_size;
uint32_t const pcount = util_safe_partitions_count(table->partitions_count);
uint32_t const pcount_has_space = pcount - 1;
for (uint32_t i = 0; i < pcount; ++i) {
part_current = part_start + i;
offset = util_size_to_human_readable_int(part_current->offset, &suffix_offset);
size = util_size_to_human_readable_int(part_current->size, &suffix_size);
printf("%s:%lu%c:%lu%c:%u ", part_current->name, offset, suffix_offset, size, suffix_size, part_current->mask_flags);
printf("%s:%lu%c:%lu%c:%u", part_current->name, offset, suffix_offset, size, suffix_size, part_current->mask_flags);
if (i != pcount_has_space) {
fputc(' ', stdout);
}
}
fputc('\n', stdout);
}
Expand Down

0 comments on commit bd4409b

Please sign in to comment.