aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2012-08-12 19:31:26 +0000
committerTiago Cunha <tcunha@gmx.com>2012-08-12 19:31:26 +0000
commit454e7d9c3ada1d46e66d55b52d74ed164566fe40 (patch)
tree2a9632440e0a6dcbdd4d18ef6ad9926a47aabc8c
parentdb27dc82f0485c0d3032aac369416207a794f69a (diff)
downloadrtmux-454e7d9c3ada1d46e66d55b52d74ed164566fe40.tar.gz
rtmux-454e7d9c3ada1d46e66d55b52d74ed164566fe40.tar.bz2
rtmux-454e7d9c3ada1d46e66d55b52d74ed164566fe40.zip
Sync OpenBSD patchset 1160:
Simplify width calculation (all numbers always sequential) and don't rely on uninitialized data, from Thomas Adam.
-rw-r--r--window-choose.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/window-choose.c b/window-choose.c
index 43b5a7b1..fdfbc8ca 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -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