summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-07-30 21:04:40 +0000
committerTiago Cunha <tcunha@gmx.com>2009-07-30 21:04:40 +0000
commit3eb77bf53fcb0d783ad2c4d4a676378eeb2452a1 (patch)
treeff0d68edd1b910f01ae9364f388f90d590d2b048
parent89826983ebb575795d1180ff96432b175a72868e (diff)
Sync OpenBSD patchset 205:
Remove some dead code found by clang.
-rw-r--r--cmd-clear-history.c5
-rw-r--r--cmd-swap-pane.c3
2 files changed, 3 insertions, 5 deletions
diff --git a/cmd-clear-history.c b/cmd-clear-history.c
index 5b6dd8d4..f91d3b43 100644
--- a/cmd-clear-history.c
+++ b/cmd-clear-history.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-clear-history.c,v 1.6 2009-07-30 20:45:20 tcunha Exp $ */
+/* $Id: cmd-clear-history.c,v 1.7 2009-07-30 21:04:40 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -41,11 +41,10 @@ int
cmd_clear_history_exec(struct cmd *self, struct cmd_ctx *ctx)
{
struct cmd_target_data *data = self->data;
- struct winlink *wl;
struct window_pane *wp;
struct grid *gd;
- if ((wl = cmd_find_pane(ctx, data->target, NULL, &wp)) == NULL)
+ if (cmd_find_pane(ctx, data->target, NULL, &wp) == NULL)
return (-1);
gd = wp->base.grid;
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index df7f6756..d09dc213 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-swap-pane.c,v 1.12 2009-07-30 20:45:20 tcunha Exp $ */
+/* $Id: cmd-swap-pane.c,v 1.13 2009-07-30 21:04:40 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -72,7 +72,6 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
dst_w = dst_wl->window;
if (data->src == NULL) {
- src_wl = dst_wl;
src_w = dst_w;
if (data->chflags & CMD_CHFLAG('D')) {
src_wp = TAILQ_NEXT(dst_wp, entry);