From 6b2009ad725b662853b8e94aee233fabdc5490f9 Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 8 Mar 2017 13:36:12 +0000 Subject: Add a helper function for the most common format_create/defaults/expand pattern. --- format.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'format.c') diff --git a/format.c b/format.c index 4df17025..7e78897f 100644 --- a/format.c +++ b/format.c @@ -500,7 +500,6 @@ format_merge(struct format_tree *ft, struct format_tree *from) if (fe->value != NULL) format_add(ft, fe->key, "%s", fe->value); } - } /* Create a new tree. */ @@ -1061,6 +1060,22 @@ format_expand(struct format_tree *ft, const char *fmt) return (buf); } +/* Expand a single string. */ +char * +format_single(struct cmdq_item *item, const char *fmt, struct client *c, + struct session *s, struct winlink *wl, struct window_pane *wp) +{ + struct format_tree *ft; + char *expanded; + + ft = format_create(item, FORMAT_NONE, 0); + format_defaults(ft, c, s, wl, wp); + + expanded = format_expand(ft, fmt); + format_free(ft); + return (expanded); +} + /* Set defaults for any of arguments that are not NULL. */ void format_defaults(struct format_tree *ft, struct client *c, struct session *s, -- cgit