diff options
Diffstat (limited to 'src/blocks/fs.c')
| -rw-r--r-- | src/blocks/fs.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/blocks/fs.c b/src/blocks/fs.c index 9c0a50c..188f14a 100644 --- a/src/blocks/fs.c +++ b/src/blocks/fs.c @@ -25,13 +25,13 @@ typedef enum { FS_USED_PERC, } block_fs_mark_t; -static const format_pair_t block_fs_pairs[] = { - { "total", FS_TOTAL }, - { "free", FS_FREE }, - { "used", FS_USED }, - { "free-percentage", FS_FREE_PERC }, - { "used-percentage", FS_USED_PERC }, - { NULL }, +static const format_option_t block_fs_options[] = { + { { "total", FS_TOTAL } }, + { { "free", FS_FREE } }, + { { "used", FS_USED } }, + { { "free-percentage", FS_FREE_PERC } }, + { { "used-percentage", FS_USED_PERC } }, + { { NULL } }, }; static const struct timespec block_fs_interval = { @@ -59,9 +59,9 @@ static void block_fs_update(block_t *block) size_t rest = start >= size ? 0 : size - start; if (rest == 0) break; - switch (fs->format.marks[i]) { + switch (fs->format.parts[i].mark) { case FS_STRING: - start += snprintf(buffer + start, rest, "%s", fs->format.parts[i]); + start += snprintf(buffer + start, rest, "%s", fs->format.parts[i].string); break; case FS_TOTAL: start += snprintf(buffer + start, rest, "%ld", sbuf.f_bsize * (uint64_t)sbuf.f_blocks); @@ -124,7 +124,7 @@ static bool block_fs_validate(block_t *block, const block_scheme_t *scheme) return false; } - int marked = format_remark(&fs->format, block->label, block_fs_pairs); + int marked = format_remark(&fs->format, block->label, block_fs_options); if (marked < 0) return false; |