Sync OpenBSD patchset 334:

Nuke unused variables and fix stupid error message.
This commit is contained in:
Tiago Cunha 2009-09-20 22:17:03 +00:00
parent 7335ef5792
commit bd24bdd411
3 changed files with 5 additions and 8 deletions

View File

@ -1,4 +1,4 @@
/* $Id: cmd-link-window.c,v 1.33 2009-09-20 22:15:32 tcunha Exp $ */
/* $Id: cmd-link-window.c,v 1.34 2009-09-20 22:17:03 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -56,7 +56,7 @@ cmd_link_window_exec(struct cmd *self, struct cmd_ctx *ctx)
kflag = data->chflags & CMD_CHFLAG('k');
dflag = data->chflags & CMD_CHFLAG('d');
if (server_link_window(wl, dst, idx, kflag, !dflag, &cause) != 0) {
ctx->error(ctx, "can't create session: %s", cause);
ctx->error(ctx, "can't link window: %s", cause);
xfree(cause);
return (-1);
}

View File

@ -1,4 +1,4 @@
/* $Id: cmd-move-window.c,v 1.10 2009-09-20 22:15:32 tcunha Exp $ */
/* $Id: cmd-move-window.c,v 1.11 2009-09-20 22:17:03 tcunha Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -56,7 +56,7 @@ cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx)
kflag = data->chflags & CMD_CHFLAG('k');
dflag = data->chflags & CMD_CHFLAG('d');
if (server_link_window(wl, dst, idx, kflag, !dflag, &cause) != 0) {
ctx->error(ctx, "can't create session: %s", cause);
ctx->error(ctx, "can't move window: %s", cause);
xfree(cause);
return (-1);
}

View File

@ -1,4 +1,4 @@
/* $Id: cmd-unlink-window.c,v 1.17 2009-09-20 22:15:32 tcunha Exp $ */
/* $Id: cmd-unlink-window.c,v 1.18 2009-09-20 22:17:03 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -43,9 +43,6 @@ cmd_unlink_window_exec(struct cmd *self, struct cmd_ctx *ctx)
struct cmd_target_data *data = self->data;
struct winlink *wl;
struct session *s;
struct client *c;
u_int i;
int destroyed;
if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL)
return (-1);