mirror of
https://github.com/tmate-io/tmate.git
synced 2025-08-17 17:11:38 +02:00
Sync OpenBSD patchset 155:
Make some functions which return unused values void (mostly found by lint) and tweak a redundant expression in window_pane_set_mode.
This commit is contained in:
14
window.c
14
window.c
@@ -1,4 +1,4 @@
|
||||
/* $Id: window.c,v 1.96 2009-07-22 12:42:57 nicm Exp $ */
|
||||
/* $Id: window.c,v 1.97 2009-07-22 17:46:53 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@@ -299,13 +299,11 @@ window_destroy(struct window *w)
|
||||
xfree(w);
|
||||
}
|
||||
|
||||
int
|
||||
void
|
||||
window_resize(struct window *w, u_int sx, u_int sy)
|
||||
{
|
||||
w->sx = sx;
|
||||
w->sy = sy;
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -530,13 +528,13 @@ window_pane_spawn(struct window_pane *wp,
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
void
|
||||
window_pane_resize(struct window_pane *wp, u_int sx, u_int sy)
|
||||
{
|
||||
struct winsize ws;
|
||||
|
||||
if (sx == wp->sx && sy == wp->sy)
|
||||
return (-1);
|
||||
return;
|
||||
wp->sx = sx;
|
||||
wp->sy = sy;
|
||||
|
||||
@@ -559,7 +557,6 @@ window_pane_resize(struct window_pane *wp, u_int sx, u_int sy)
|
||||
if (errno != EINVAL)
|
||||
#endif
|
||||
fatal("ioctl failed");
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
@@ -567,9 +564,8 @@ window_pane_set_mode(struct window_pane *wp, const struct window_mode *mode)
|
||||
{
|
||||
struct screen *s;
|
||||
|
||||
if (wp->mode != NULL || wp->mode == mode)
|
||||
if (wp->mode != NULL)
|
||||
return (1);
|
||||
|
||||
wp->mode = mode;
|
||||
|
||||
if ((s = wp->mode->init(wp)) != NULL)
|
||||
|
Reference in New Issue
Block a user