external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-23 04:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

module/removables: cleanup

Browse source
This commit is contained in:
Daniel Eklöf 2019-01-01 20:18:48 +01:00
parent 14f9aec088
commit bdd760a40b
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/removables.c
View file

@ -119,6 +119,9 @@ content(struct module *mod)
label = dummy_label; label = dummy_label;
} }
bool is_mounted = tll_length(p->mount_points) > 0;
const char *mount_point = is_mounted ? tll_front(p->mount_points) : "";
struct tag_set tags = { struct tag_set tags = {
.tags = (struct tag *[]){ .tags = (struct tag *[]){
tag_new_string(mod, "vendor", p->block->vendor), tag_new_string(mod, "vendor", p->block->vendor),
@ -126,10 +129,8 @@ content(struct module *mod)
tag_new_string(mod, "device", p->dev_path), tag_new_string(mod, "device", p->dev_path),
tag_new_int_range(mod, "size", p->size, 0, p->block->size), tag_new_int_range(mod, "size", p->size, 0, p->block->size),
tag_new_string(mod, "label", label), tag_new_string(mod, "label", label),
tag_new_bool(mod, "mounted", tll_length(p->mount_points) > 0), tag_new_bool(mod, "mounted", is_mounted),
tag_new_string( tag_new_string(mod, "mount_point", mount_point),
mod, "mount_point",
tll_length(p->mount_points) > 0 ? tll_front(p->mount_points) : ""),
}, },
.count = 7, .count = 7,
}; };
@ -139,7 +140,8 @@ content(struct module *mod)
} }
tll_free(partitions); tll_free(partitions);
return dynlist_exposable_new(exposables, idx, m->left_spacing, m->right_spacing); return dynlist_exposable_new(
exposables, idx, m->left_spacing, m->right_spacing);
} }
static void static void