Merge branch 'tag-fmt-is-maybe-uninitialized-warning'

Closes #311
This commit is contained in:
Daniel Eklöf 2023-07-14 13:05:17 +02:00
commit 9f5f35a8ac
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 9 additions and 1 deletions

View file

@ -17,6 +17,12 @@
### Deprecated ### Deprecated
### Removed ### Removed
### Fixed ### Fixed
* Compiler error _fmt may be used uninitialized_ ([#311][311]).
[311]: https://codeberg.org/dnkl/yambar/issues/311
### Security ### Security
### Contributors ### Contributors

4
tag.c
View file

@ -674,7 +674,7 @@ tags_expand_template(const char *template, const struct tag_set *tags)
const long max = tag->max(tag); const long max = tag->max(tag);
long value = kind == VALUE_MIN ? min : max; long value = kind == VALUE_MIN ? min : max;
const char *fmt; const char *fmt = NULL;
switch (format) { switch (format) {
case FMT_DEFAULT: fmt = zero_pad ? "%0*ld" : "%*ld"; break; case FMT_DEFAULT: fmt = zero_pad ? "%0*ld" : "%*ld"; break;
case FMT_HEX: fmt = zero_pad ? "%0*lx" : "%*lx"; break; case FMT_HEX: fmt = zero_pad ? "%0*lx" : "%*lx"; break;
@ -704,6 +704,8 @@ tags_expand_template(const char *template, const struct tag_set *tags)
} }
} }
assert(fmt != NULL);
char str[24]; char str[24];
snprintf(str, sizeof(str), fmt, digits, value); snprintf(str, sizeof(str), fmt, digits, value);
sbuf_append(&formatted, str); sbuf_append(&formatted, str);