diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-08-12 22:01:22 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-08-12 22:01:22 +0100 |
| commit | 94d96c6179277cae2443a3358d538493683576c9 (patch) | |
| tree | 8e0c7c3ffd4b0888fd7d16c5b4996a148af09889 /format.c | |
| parent | 9d7b1960c2bf36f678cbe213ba46221f0b80b31e (diff) | |
| parent | 6feb8f6505441583bb9f289da2227954c8335ce4 (diff) | |
| download | rtmux-94d96c6179277cae2443a3358d538493683576c9.tar.gz rtmux-94d96c6179277cae2443a3358d538493683576c9.tar.bz2 rtmux-94d96c6179277cae2443a3358d538493683576c9.zip | |
Merge branch 'obsd-master' into master
Diffstat (limited to 'format.c')
| -rw-r--r-- | format.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -4300,15 +4300,14 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen, if (strcmp(found, condition) == 0) { free(found); found = xstrdup(""); - format_log(es, "condition '%s' found: %s", - condition, found); - } else { format_log(es, "condition '%s' not found; assuming false", condition); } - } else - format_log(es, "condition '%s' found", condition); + } else { + format_log(es, "condition '%s' found: %s", condition, + found); + } if (format_choose(es, cp + 1, &left, &right, 0) != 0) { format_log(es, "condition '%s' syntax error: %s", |