From b87dc608d9b5b470926aaf77c5956befdfb7bc7b Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 30 Aug 2015 15:43:40 +0000
Subject: [PATCH] Some style nits and dead assignments.
---
cmd-show-environment.c | 2 +-
cmd-swap-pane.c | 2 --
server-client.c | 7 -------
tmux.c | 4 ++--
xterm-keys.c | 2 ++
5 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/cmd-show-environment.c b/cmd-show-environment.c
index a61cf3f4..af24d91b 100644
--- a/cmd-show-environment.c
+++ b/cmd-show-environment.c
@@ -56,7 +56,7 @@ cmd_show_environment_escape(struct environ_entry *envent)
}
*out = '\0';
- return ret;
+ return (ret);
}
void
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index c4751c36..dc2b7246 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -58,12 +58,10 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
src_wp = TAILQ_NEXT(dst_wp, entry);
if (src_wp == NULL)
src_wp = TAILQ_FIRST(&dst_w->panes);
- src_wl = dst_wl;
} else if (args_has(self->args, 'U')) {
src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
if (src_wp == NULL)
src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
- src_wl = dst_wl;
} else {
src_wl = cmd_find_pane_marked(cmdq, NULL, NULL,
&src_wp);
diff --git a/server-client.c b/server-client.c
index 8e298954..08058ab4 100644
--- a/server-client.c
+++ b/server-client.c
@@ -551,13 +551,6 @@ server_client_handle_key(struct client *c, int key)
w = s->curw->window;
wp = w->active;
- /* No session, do nothing. */
- if (c->session == NULL)
- return;
- s = c->session;
- w = c->session->curw->window;
- wp = w->active;
-
/* Update the activity timer. */
if (gettimeofday(&c->activity_time, NULL) != 0)
fatal("gettimeofday failed");
diff --git a/tmux.c b/tmux.c
index a3481461..e66d24c0 100644
--- a/tmux.c
+++ b/tmux.c
@@ -198,7 +198,7 @@ shell_exec(const char *shell, const char *shellcmd)
fatal("execl failed");
}
-const char*
+const char *
find_home(void)
{
struct passwd *pw;
@@ -213,7 +213,7 @@ find_home(void)
home = NULL;
}
- return home;
+ return (home);
}
int
diff --git a/xterm-keys.c b/xterm-keys.c
index 5ca75d89..10d51c78 100644
--- a/xterm-keys.c
+++ b/xterm-keys.c
@@ -120,6 +120,8 @@ xterm_keys_match(const char *template, const char *buf, size_t len,
size_t pos;
int retval;
+ *modifiers = 0;
+
if (len == 0)
return (0);