pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

tag: handle width formatter on ints when no other formatting options are used

Browse source 
For example: in {cpu:3}, the ‘3’ were ignored, assuming ‘cpu’ was an
int tag.
This commit is contained in:
Daniel Eklöf 2023-01-02 12:19:17 +01:00
parent 38a1d0b57c
commit 0f3894bf63
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tag.c
View file

@ -591,14 +591,28 @@ tags_expand_template(const char *template, const struct tag_set *tags)
case VALUE_VALUE: case VALUE_VALUE:
switch (format) { switch (format) {
case FMT_DEFAULT: { case FMT_DEFAULT: {
if (tag->type(tag) == TAG_TYPE_FLOAT){ switch (tag->type(tag)) {
case TAG_TYPE_FLOAT: {
const char* fmt = zero_pad ? "%0*.*f" : "%*.*f"; const char* fmt = zero_pad ? "%0*.*f" : "%*.*f";
char str[24]; char str[24];
snprintf(str, sizeof(str), fmt, digits, decimals, tag->as_float(tag)); snprintf(str, sizeof(str), fmt, digits, decimals, tag->as_float(tag));
sbuf_append(&formatted, str); sbuf_append(&formatted, str);
} else { break;
sbuf_append(&formatted, tag->as_string(tag));
} }
case TAG_TYPE_INT: {
const char* fmt = zero_pad ? "%0*ld" : "%*ld";
char str[24];
snprintf(str, sizeof(str), fmt, digits, tag->as_int(tag));
sbuf_append(&formatted, str);
break;
}
default:
sbuf_append(&formatted, tag->as_string(tag));
break;
}
break; break;
} }