summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2012-08-12 06:22:26 +0000
committernicm <nicm@openbsd.org>2012-08-12 06:22:26 +0000
commit1179b75fe6e492eabe9627e35524270e9363b300 (patch)
tree6eeb37dae1a8b7bbc7f4ca35affea13c16765b13
parent.Sq should use curly right quotes in HTML output to match its curly (diff)
downloadwireguard-openbsd-1179b75fe6e492eabe9627e35524270e9363b300.tar.xz
wireguard-openbsd-1179b75fe6e492eabe9627e35524270e9363b300.zip
Simplify width calculation (all numbers always sequential) and don't
rely on uninitialized data, from Thomas Adam.
-rw-r--r--usr.bin/tmux/window-choose.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/tmux/window-choose.c b/usr.bin/tmux/window-choose.c
index 2a2baa638cf..ffe9da09aef 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.22 2012/08/11 06:45:33 nicm Exp $ */
+/* $OpenBSD: window-choose.c,v 1.23 2012/08/12 06:22:26 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -80,7 +80,6 @@ window_choose_add(struct window_pane *wp, struct window_choose_data *wcd)
{
struct window_choose_mode_data *data = wp->modedata;
struct window_choose_mode_item *item;
- int width;
char tmp[10];
ARRAY_EXPAND(&data->list, 1);
@@ -90,9 +89,7 @@ window_choose_add(struct window_pane *wp, struct window_choose_data *wcd)
item->wcd = wcd;
item->pos = ARRAY_LENGTH(&data->list) - 1;
- width = snprintf (tmp, sizeof tmp, "%u", item->pos);
- if (width > data->width)
- data->width = width;
+ data->width = snprintf (tmp, sizeof tmp , "%u", item->pos);
}
void