Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2019-11-28 22:01:24 +00:00
commit 34084fe666

View File

@ -1128,11 +1128,10 @@ format_find(struct format_tree *ft, const char *key, int modifiers)
xasprintf(&found, "%lld", (long long)fe->t);
goto found;
}
if (fe->value == NULL && fe->cb != NULL) {
if (fe->value == NULL && fe->cb != NULL)
fe->cb(ft, fe);
if (fe->value == NULL)
fe->value = xstrdup("");
}
if (fe->value == NULL)
fe->value = xstrdup("");
found = xstrdup(fe->value);
goto found;
}