diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-12-26 16:01:25 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-12-26 16:01:25 +0000 |
| commit | 0aa6c6f6471a8544222733ec7820eca44d9a6cab (patch) | |
| tree | a8d0711c18742859b6486786e4a1f5ced62f4c27 /format.c | |
| parent | b931bbb319ce135c9dca37a8e33ed1c6d13a09f4 (diff) | |
| parent | 88ee5b1a73c33c396580a1eb0a0605de98a79fa3 (diff) | |
| download | rtmux-0aa6c6f6471a8544222733ec7820eca44d9a6cab.tar.gz rtmux-0aa6c6f6471a8544222733ec7820eca44d9a6cab.tar.bz2 rtmux-0aa6c6f6471a8544222733ec7820eca44d9a6cab.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'format.c')
| -rw-r--r-- | format.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1166,12 +1166,12 @@ format_each(struct format_tree *ft, void (*cb)(const char *, const char *, void *), void *arg) { struct format_entry *fe; - static char s[64]; + char s[64]; RB_FOREACH(fe, format_entry_tree, &ft->tree) { if (fe->t != 0) { xsnprintf(s, sizeof s, "%lld", (long long)fe->t); - cb(fe->key, fe->value, s); + cb(fe->key, s, arg); } else { if (fe->value == NULL && fe->cb != NULL) { fe->cb(ft, fe); @@ -1214,8 +1214,7 @@ format_add(struct format_tree *ft, const char *key, const char *fmt, ...) static void format_add_tv(struct format_tree *ft, const char *key, struct timeval *tv) { - struct format_entry *fe; - struct format_entry *fe_now; + struct format_entry *fe, *fe_now; fe = xmalloc(sizeof *fe); fe->key = xstrdup(key); |