diff options
-rw-r--r-- | usr.bin/tmux/cmd-attach-session.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-break-pane.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-display-message.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-if-shell.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-list-buffers.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-list-clients.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-list-panes.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-list-sessions.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-list-windows.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-new-session.c | 6 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-new-window.c | 6 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-pipe-pane.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-run-shell.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-split-window.c | 6 | ||||
-rw-r--r-- | usr.bin/tmux/control-notify.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/format.c | 11 | ||||
-rw-r--r-- | usr.bin/tmux/names.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/server-client.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/status.c | 10 | ||||
-rw-r--r-- | usr.bin/tmux/tmux.h | 5 | ||||
-rw-r--r-- | usr.bin/tmux/window-choose.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/window-copy.c | 4 |
22 files changed, 50 insertions, 58 deletions
diff --git a/usr.bin/tmux/cmd-attach-session.c b/usr.bin/tmux/cmd-attach-session.c index 98582995407..e7f77528035 100644 --- a/usr.bin/tmux/cmd-attach-session.c +++ b/usr.bin/tmux/cmd-attach-session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-attach-session.c,v 1.51 2015/12/08 01:10:31 nicm Exp $ */ +/* $OpenBSD: cmd-attach-session.c,v 1.52 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -93,7 +93,7 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag, } if (cflag != NULL) { - ft = format_create(); + ft = format_create(0); format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, NULL, NULL); cwd = format_expand(ft, cflag); diff --git a/usr.bin/tmux/cmd-break-pane.c b/usr.bin/tmux/cmd-break-pane.c index 1295e237f5b..068dab642eb 100644 --- a/usr.bin/tmux/cmd-break-pane.c +++ b/usr.bin/tmux/cmd-break-pane.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-break-pane.c,v 1.30 2015/12/02 23:09:22 nicm Exp $ */ +/* $OpenBSD: cmd-break-pane.c,v 1.31 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -101,7 +101,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_q *cmdq) if ((template = args_get(args, 'F')) == NULL) template = BREAK_PANE_TEMPLATE; - ft = format_create(); + ft = format_create(0); format_defaults(ft, cmd_find_client(cmdq, NULL, 1), dst_s, wl, wp); diff --git a/usr.bin/tmux/cmd-display-message.c b/usr.bin/tmux/cmd-display-message.c index 2aef0ee0b0a..847d842c383 100644 --- a/usr.bin/tmux/cmd-display-message.c +++ b/usr.bin/tmux/cmd-display-message.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-display-message.c,v 1.29 2015/11/18 16:49:13 nicm Exp $ */ +/* $OpenBSD: cmd-display-message.c,v 1.30 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -88,7 +88,7 @@ cmd_display_message_exec(struct cmd *self, struct cmd_q *cmdq) if (template == NULL) template = DISPLAY_MESSAGE_TEMPLATE; - ft = format_create(); + ft = format_create(0); format_defaults(ft, c, s, wl, wp); msg = format_expand_time(ft, template, time(NULL)); diff --git a/usr.bin/tmux/cmd-if-shell.c b/usr.bin/tmux/cmd-if-shell.c index cb360c9de63..d98471968df 100644 --- a/usr.bin/tmux/cmd-if-shell.c +++ b/usr.bin/tmux/cmd-if-shell.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-if-shell.c,v 1.35 2015/11/20 22:02:54 nicm Exp $ */ +/* $OpenBSD: cmd-if-shell.c,v 1.36 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -86,7 +86,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq) cwd = NULL; } - ft = format_create(); + ft = format_create(0); format_defaults(ft, NULL, s, wl, wp); shellcmd = format_expand(ft, args->argv[0]); format_free(ft); diff --git a/usr.bin/tmux/cmd-list-buffers.c b/usr.bin/tmux/cmd-list-buffers.c index a6d347d95fb..faa1a072ff9 100644 --- a/usr.bin/tmux/cmd-list-buffers.c +++ b/usr.bin/tmux/cmd-list-buffers.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-list-buffers.c,v 1.26 2015/11/18 14:27:44 nicm Exp $ */ +/* $OpenBSD: cmd-list-buffers.c,v 1.27 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -54,7 +54,7 @@ cmd_list_buffers_exec(struct cmd *self, struct cmd_q *cmdq) pb = NULL; while ((pb = paste_walk(pb)) != NULL) { - ft = format_create(); + ft = format_create(0); format_defaults_paste_buffer(ft, pb); line = format_expand(ft, template); diff --git a/usr.bin/tmux/cmd-list-clients.c b/usr.bin/tmux/cmd-list-clients.c index 48a874646b5..a01506f7695 100644 --- a/usr.bin/tmux/cmd-list-clients.c +++ b/usr.bin/tmux/cmd-list-clients.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-list-clients.c,v 1.21 2015/04/24 23:17:11 nicm Exp $ */ +/* $OpenBSD: cmd-list-clients.c,v 1.22 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -69,7 +69,7 @@ cmd_list_clients_exec(struct cmd *self, struct cmd_q *cmdq) if (c->session == NULL || (s != NULL && s != c->session)) continue; - ft = format_create(); + ft = format_create(0); format_add(ft, "line", "%u", idx); format_defaults(ft, c, NULL, NULL, NULL); diff --git a/usr.bin/tmux/cmd-list-panes.c b/usr.bin/tmux/cmd-list-panes.c index 10c51c321f0..3ce0af843d6 100644 --- a/usr.bin/tmux/cmd-list-panes.c +++ b/usr.bin/tmux/cmd-list-panes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-list-panes.c,v 1.21 2015/09/16 22:40:05 nicm Exp $ */ +/* $OpenBSD: cmd-list-panes.c,v 1.22 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -125,7 +125,7 @@ cmd_list_panes_window(struct cmd *self, struct session *s, struct winlink *wl, n = 0; TAILQ_FOREACH(wp, &wl->window->panes, entry) { - ft = format_create(); + ft = format_create(0); format_add(ft, "line", "%u", n); format_defaults(ft, NULL, s, wl, wp); diff --git a/usr.bin/tmux/cmd-list-sessions.c b/usr.bin/tmux/cmd-list-sessions.c index 32ef9862bac..26d6f4b7447 100644 --- a/usr.bin/tmux/cmd-list-sessions.c +++ b/usr.bin/tmux/cmd-list-sessions.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-list-sessions.c,v 1.20 2015/10/25 22:29:17 nicm Exp $ */ +/* $OpenBSD: cmd-list-sessions.c,v 1.21 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -61,7 +61,7 @@ cmd_list_sessions_exec(struct cmd *self, struct cmd_q *cmdq) n = 0; RB_FOREACH(s, sessions, &sessions) { - ft = format_create(); + ft = format_create(0); format_add(ft, "line", "%u", n); format_defaults(ft, NULL, s, NULL, NULL); diff --git a/usr.bin/tmux/cmd-list-windows.c b/usr.bin/tmux/cmd-list-windows.c index 3a0eabbb3f6..97039998f4d 100644 --- a/usr.bin/tmux/cmd-list-windows.c +++ b/usr.bin/tmux/cmd-list-windows.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-list-windows.c,v 1.30 2015/02/05 10:29:43 nicm Exp $ */ +/* $OpenBSD: cmd-list-windows.c,v 1.31 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -105,7 +105,7 @@ cmd_list_windows_session( n = 0; RB_FOREACH(wl, winlinks, &s->windows) { - ft = format_create(); + ft = format_create(0); format_add(ft, "line", "%u", n); format_defaults(ft, NULL, s, wl, NULL); diff --git a/usr.bin/tmux/cmd-new-session.c b/usr.bin/tmux/cmd-new-session.c index 563a536f5dc..315478dc6c0 100644 --- a/usr.bin/tmux/cmd-new-session.c +++ b/usr.bin/tmux/cmd-new-session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-new-session.c,v 1.77 2015/10/31 14:51:15 nicm Exp $ */ +/* $OpenBSD: cmd-new-session.c,v 1.78 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -119,7 +119,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq) /* Get the new session working directory. */ to_free = NULL; if (args_has(args, 'c')) { - ft = format_create(); + ft = format_create(0); format_defaults(ft, cmd_find_client(cmdq, NULL, 1), NULL, NULL, NULL); to_free = cwd = format_expand(ft, args_get(args, 'c')); @@ -283,7 +283,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq) if ((template = args_get(args, 'F')) == NULL) template = NEW_SESSION_TEMPLATE; - ft = format_create(); + ft = format_create(0); format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, NULL, NULL); diff --git a/usr.bin/tmux/cmd-new-window.c b/usr.bin/tmux/cmd-new-window.c index 953f59ac6ef..a9a71465941 100644 --- a/usr.bin/tmux/cmd-new-window.c +++ b/usr.bin/tmux/cmd-new-window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-new-window.c,v 1.52 2015/11/20 22:02:54 nicm Exp $ */ +/* $OpenBSD: cmd-new-window.c,v 1.53 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -94,7 +94,7 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq) to_free = NULL; if (args_has(args, 'c')) { - ft = format_create(); + ft = format_create(0); format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, NULL, NULL); cwd = to_free = format_expand(ft, args_get(args, 'c')); @@ -143,7 +143,7 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq) if ((template = args_get(args, 'F')) == NULL) template = NEW_WINDOW_TEMPLATE; - ft = format_create(); + ft = format_create(0); format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, wl, NULL); diff --git a/usr.bin/tmux/cmd-pipe-pane.c b/usr.bin/tmux/cmd-pipe-pane.c index 7a706811b5f..e64fe75892e 100644 --- a/usr.bin/tmux/cmd-pipe-pane.c +++ b/usr.bin/tmux/cmd-pipe-pane.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-pipe-pane.c,v 1.30 2015/11/18 14:27:44 nicm Exp $ */ +/* $OpenBSD: cmd-pipe-pane.c,v 1.31 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -89,7 +89,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq) } /* Expand the command. */ - ft = format_create(); + ft = format_create(0); format_defaults(ft, c, s, wl, wp); cmd = format_expand_time(ft, args->argv[0], time(NULL)); format_free(ft); diff --git a/usr.bin/tmux/cmd-run-shell.c b/usr.bin/tmux/cmd-run-shell.c index b163a98bc49..0839a7d5ba1 100644 --- a/usr.bin/tmux/cmd-run-shell.c +++ b/usr.bin/tmux/cmd-run-shell.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-run-shell.c,v 1.30 2015/10/31 08:13:58 nicm Exp $ */ +/* $OpenBSD: cmd-run-shell.c,v 1.31 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -100,7 +100,7 @@ cmd_run_shell_exec(struct cmd *self, struct cmd_q *cmdq) cwd = NULL; } - ft = format_create(); + ft = format_create(0); format_defaults(ft, NULL, s, wl, wp); shellcmd = format_expand(ft, args->argv[0]); format_free(ft); diff --git a/usr.bin/tmux/cmd-split-window.c b/usr.bin/tmux/cmd-split-window.c index 6acfb87b2b6..5c06e692944 100644 --- a/usr.bin/tmux/cmd-split-window.c +++ b/usr.bin/tmux/cmd-split-window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-split-window.c,v 1.62 2015/10/31 14:51:15 nicm Exp $ */ +/* $OpenBSD: cmd-split-window.c,v 1.63 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -88,7 +88,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) to_free = NULL; if (args_has(args, 'c')) { - ft = format_create(); + ft = format_create(0); format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, NULL, NULL); to_free = cwd = format_expand(ft, args_get(args, 'c')); @@ -165,7 +165,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) if ((template = args_get(args, 'F')) == NULL) template = SPLIT_WINDOW_TEMPLATE; - ft = format_create(); + ft = format_create(0); format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, wl, new_wp); diff --git a/usr.bin/tmux/control-notify.c b/usr.bin/tmux/control-notify.c index 1a34fb31ce0..ecd1b1a21b5 100644 --- a/usr.bin/tmux/control-notify.c +++ b/usr.bin/tmux/control-notify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control-notify.c,v 1.13 2015/11/18 14:27:44 nicm Exp $ */ +/* $OpenBSD: control-notify.c,v 1.14 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2012 Nicholas Marriott <nicm@users.sourceforge.net> @@ -88,7 +88,7 @@ control_notify_window_layout_changed(struct window *w) if (w->layout_root == NULL) continue; - ft = format_create(); + ft = format_create(0); wl = winlink_find_by_window(&s->windows, w); if (wl != NULL) { format_defaults(ft, c, NULL, wl, NULL); diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c index de04b6f0133..e695f657ec5 100644 --- a/usr.bin/tmux/format.c +++ b/usr.bin/tmux/format.c @@ -1,4 +1,4 @@ -/* $OpenBSD: format.c,v 1.100 2015/11/24 21:52:06 nicm Exp $ */ +/* $OpenBSD: format.c,v 1.101 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net> @@ -465,14 +465,7 @@ format_cb_pane_tabs(struct format_tree *ft, struct format_entry *fe) /* Create a new tree. */ struct format_tree * -format_create(void) -{ - return (format_create_flags(0)); -} - -/* Create a new tree for the status line. */ -struct format_tree * -format_create_flags(int flags) +format_create(int flags) { struct format_tree *ft; diff --git a/usr.bin/tmux/names.c b/usr.bin/tmux/names.c index 8340d5799b7..baaf7ae7a78 100644 --- a/usr.bin/tmux/names.c +++ b/usr.bin/tmux/names.c @@ -1,4 +1,4 @@ -/* $OpenBSD: names.c,v 1.31 2015/11/18 14:27:44 nicm Exp $ */ +/* $OpenBSD: names.c,v 1.32 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -118,7 +118,7 @@ format_window_name(struct window *w) struct format_tree *ft; char *fmt, *name; - ft = format_create(); + ft = format_create(0); format_defaults_window(ft, w); format_defaults_pane(ft, w->active); diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 22f90d93726..ecf55e53122 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.174 2015/12/08 01:10:31 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.175 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -933,7 +933,7 @@ server_client_set_title(struct client *c) template = options_get_string(s->options, "set-titles-string"); - ft = format_create(); + ft = format_create(0); format_defaults(ft, c, NULL, NULL, NULL); title = format_expand_time(ft, template, time(NULL)); diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index 2ea0ffad032..ad0e7159f65 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.143 2015/11/22 18:28:01 tim Exp $ */ +/* $OpenBSD: status.c,v 1.144 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -500,9 +500,9 @@ status_replace(struct client *c, struct winlink *wl, const char *fmt, time_t t) return (xstrdup("")); if (c->flags & CLIENT_STATUSFORCE) - ft = format_create_flags(FORMAT_STATUS|FORMAT_FORCE); + ft = format_create(FORMAT_STATUS|FORMAT_FORCE); else - ft = format_create_flags(FORMAT_STATUS); + ft = format_create(FORMAT_STATUS); format_defaults(ft, c, NULL, wl, NULL); expanded = format_expand_time(ft, fmt, t); @@ -661,7 +661,7 @@ status_prompt_set(struct client *c, const char *msg, const char *input, int keys; time_t t; - ft = format_create(); + ft = format_create(0); format_defaults(ft, c, NULL, NULL, NULL); t = time(NULL); @@ -722,7 +722,7 @@ status_prompt_update(struct client *c, const char *msg, const char *input) struct format_tree *ft; time_t t; - ft = format_create(); + ft = format_create(0); format_defaults(ft, c, NULL, NULL, NULL); t = time(NULL); diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 58ca206df90..059d6223ad0 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.596 2015/12/08 08:14:04 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.597 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1492,8 +1492,7 @@ char *paste_make_sample(struct paste_buffer *); #define FORMAT_STATUS 0x1 #define FORMAT_FORCE 0x2 struct format_tree; -struct format_tree *format_create(void); -struct format_tree *format_create_flags(int); +struct format_tree *format_create(int); void format_free(struct format_tree *); void printflike(3, 4) format_add(struct format_tree *, const char *, const char *, ...); diff --git a/usr.bin/tmux/window-choose.c b/usr.bin/tmux/window-choose.c index 0460efa9c60..fa66cf82e3f 100644 --- a/usr.bin/tmux/window-choose.c +++ b/usr.bin/tmux/window-choose.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-choose.c,v 1.70 2015/11/18 14:27:44 nicm Exp $ */ +/* $OpenBSD: window-choose.c,v 1.71 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -186,7 +186,7 @@ window_choose_data_create(int type, struct client *c, struct session *s) wcd = xmalloc(sizeof *wcd); wcd->type = type; - wcd->ft = format_create(); + wcd->ft = format_create(0); wcd->ft_template = NULL; wcd->command = NULL; diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c index ec7fe3467b0..649930cf2c2 100644 --- a/usr.bin/tmux/window-copy.c +++ b/usr.bin/tmux/window-copy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-copy.c,v 1.141 2015/11/18 14:27:44 nicm Exp $ */ +/* $OpenBSD: window-copy.c,v 1.142 2015/12/08 08:34:18 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1480,7 +1480,7 @@ window_copy_copy_pipe(struct window_pane *wp, struct session *sess, if (buf == NULL) return; - ft = format_create(); + ft = format_create(0); format_defaults(ft, NULL, sess, NULL, wp); expanded = format_expand(ft, arg); |