Sync OpenBSD patchset 807:

Style tweaks.
This commit is contained in:
Tiago Cunha 2010-12-25 23:43:53 +00:00
parent a373235106
commit 3585feca54

12
input.c
View File

@ -1,4 +1,4 @@
/* $Id: input.c,v 1.110 2010-12-06 22:52:21 nicm Exp $ */
/* $Id: input.c,v 1.111 2010-12-25 23:43:53 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -720,11 +720,11 @@ input_parse(struct window_pane *wp)
* Execute the handler, if any. Don't switch state if it
* returns non-zero.
*/
if (itr->handler && itr->handler(ictx) != 0)
if (itr->handler != NULL && itr->handler(ictx) != 0)
continue;
/* And switch state, if necessary. */
if (itr->state) {
if (itr->state != NULL) {
if (ictx->state->exit != NULL)
ictx->state->exit(ictx);
ictx->state = itr->state;
@ -924,9 +924,9 @@ input_c0_dispatch(struct input_ctx *ictx)
int
input_esc_dispatch(struct input_ctx *ictx)
{
struct screen_write_ctx *sctx = &ictx->ctx;
struct screen *s = sctx->s;
struct input_table_entry *entry;
struct screen_write_ctx *sctx = &ictx->ctx;
struct screen *s = sctx->s;
struct input_table_entry *entry;
if (ictx->flags & INPUT_DISCARD)
return (0);