diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2013-03-26 10:54:49 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2013-03-26 10:54:49 +0000 |
| commit | 3394e2b40fdfaf47946051fdcc269dec29ff9a82 (patch) | |
| tree | 05e61e1a4429606c24e8d5a4d3bfbbfaac47a435 /usr.bin/tmux | |
| parent | a666fd148fc4d2bc9c9d7aebadd475a5583662a7 (diff) | |
Fix compiler warnings, missing #include. From Thomas Adam.
Diffstat (limited to 'usr.bin/tmux')
| -rw-r--r-- | usr.bin/tmux/cmd-queue.c | 3 | ||||
| -rw-r--r-- | usr.bin/tmux/control-notify.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/control.c | 3 | ||||
| -rw-r--r-- | usr.bin/tmux/window.c | 11 |
4 files changed, 10 insertions, 13 deletions
diff --git a/usr.bin/tmux/cmd-queue.c b/usr.bin/tmux/cmd-queue.c index 31bbc0354b0..40c3e6be78b 100644 --- a/usr.bin/tmux/cmd-queue.c +++ b/usr.bin/tmux/cmd-queue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-queue.c,v 1.6 2013/03/25 11:41:16 nicm Exp $ */ +/* $OpenBSD: cmd-queue.c,v 1.7 2013/03/26 10:54:48 nicm Exp $ */ /* * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net> @@ -20,6 +20,7 @@ #include <ctype.h> #include <stdlib.h> +#include <time.h> #include "tmux.h" diff --git a/usr.bin/tmux/control-notify.c b/usr.bin/tmux/control-notify.c index 4cf00c71bd7..fb25db1dd2a 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.7 2013/03/25 11:40:54 nicm Exp $ */ +/* $OpenBSD: control-notify.c,v 1.8 2013/03/26 10:54:48 nicm Exp $ */ /* * Copyright (c) 2012 Nicholas Marriott <nicm@users.sourceforge.net> @@ -99,14 +99,12 @@ void control_notify_window_unlinked(unused struct session *s, struct window *w) { struct client *c; - struct session *cs; u_int i; for (i = 0; i < ARRAY_LENGTH(&clients); i++) { c = ARRAY_ITEM(&clients, i); if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL) continue; - cs = c->session; control_write(c, "%%window-close @%u", w->id); } @@ -136,14 +134,12 @@ void control_notify_window_renamed(struct window *w) { struct client *c; - struct session *s; u_int i; for (i = 0; i < ARRAY_LENGTH(&clients); i++) { c = ARRAY_ITEM(&clients, i); if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL) continue; - s = c->session; control_write(c, "%%window-renamed @%u %s", w->id, w->name); } diff --git a/usr.bin/tmux/control.c b/usr.bin/tmux/control.c index 2f4f59e906f..eff52463baa 100644 --- a/usr.bin/tmux/control.c +++ b/usr.bin/tmux/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.9 2013/03/25 11:35:55 nicm Exp $ */ +/* $OpenBSD: control.c,v 1.10 2013/03/26 10:54:48 nicm Exp $ */ /* * Copyright (c) 2012 Nicholas Marriott <nicm@users.sourceforge.net> @@ -22,6 +22,7 @@ #include <event.h> #include <stdlib.h> #include <string.h> +#include <time.h> #include "tmux.h" diff --git a/usr.bin/tmux/window.c b/usr.bin/tmux/window.c index e7acc2b2f3d..37639757e05 100644 --- a/usr.bin/tmux/window.c +++ b/usr.bin/tmux/window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window.c,v 1.96 2013/03/25 15:59:57 nicm Exp $ */ +/* $OpenBSD: window.c,v 1.97 2013/03/26 10:54:48 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -496,19 +496,18 @@ window_zoom(struct window_pane *wp) int window_unzoom(struct window *w) { - struct window_pane *wp, *wp1; + struct window_pane *wp; if (!(w->flags & WINDOW_ZOOMED)) return (-1); - wp = w->active; w->flags &= ~WINDOW_ZOOMED; layout_free(w); w->layout_root = w->saved_layout_root; - TAILQ_FOREACH(wp1, &w->panes, entry) { - wp1->layout_cell = wp1->saved_layout_cell; - wp1->saved_layout_cell = NULL; + TAILQ_FOREACH(wp, &w->panes, entry) { + wp->layout_cell = wp->saved_layout_cell; + wp->saved_layout_cell = NULL; } layout_fix_panes(w, w->sx, w->sy); |