From 0b3cb2293e82f62871194657cb06cc23d5c97cf5 Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 10 Jun 2015 12:56:04 +0000 Subject: [PATCH] wp->tty is a char [] not a char * so it can't be NULL. From Thomas Adam. --- usr.bin/tmux/format.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c index 6459e96280b..aea5f31ae9f 100644 --- a/usr.bin/tmux/format.c +++ b/usr.bin/tmux/format.c @@ -1,4 +1,4 @@ -/* $OpenBSD: format.c,v 1.70 2015/05/29 23:26:52 nicm Exp $ */ +/* $OpenBSD: format.c,v 1.71 2015/06/10 12:56:04 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott @@ -872,8 +872,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp) format_add(ft, "pane_synchronized", "%d", !!options_get_number(&wp->window->options, "synchronize-panes")); - if (wp->tty != NULL) - format_add(ft, "pane_tty", "%s", wp->tty); + format_add(ft, "pane_tty", "%s", wp->tty); format_add(ft, "pane_pid", "%ld", (long) wp->pid); if ((cmd = cmd_stringify_argv(wp->argc, wp->argv)) != NULL) { format_add(ft, "pane_start_command", "%s", cmd); -- 2.20.1