mirror of
https://github.com/tmux/tmux.git
synced 2026-10-10 12:14:43 +00:00
Merge branch 'obsd-master'
This commit is contained in:
6
layout.c
6
layout.c
@@ -62,11 +62,9 @@ layout_create_cell(struct layout_cell *lcparent)
|
|||||||
{
|
{
|
||||||
struct layout_cell *lc;
|
struct layout_cell *lc;
|
||||||
|
|
||||||
lc = xmalloc(sizeof *lc);
|
lc = xcalloc(1, sizeof *lc);
|
||||||
lc->type = LAYOUT_WINDOWPANE;
|
lc->type = LAYOUT_WINDOWPANE;
|
||||||
lc->flags = 0;
|
|
||||||
lc->parent = lcparent;
|
lc->parent = lcparent;
|
||||||
|
|
||||||
TAILQ_INIT(&lc->cells);
|
TAILQ_INIT(&lc->cells);
|
||||||
|
|
||||||
lc->sx = UINT_MAX;
|
lc->sx = UINT_MAX;
|
||||||
@@ -81,8 +79,6 @@ layout_create_cell(struct layout_cell *lcparent)
|
|||||||
lc->saved_xoff = INT_MAX;
|
lc->saved_xoff = INT_MAX;
|
||||||
lc->saved_yoff = INT_MAX;
|
lc->saved_yoff = INT_MAX;
|
||||||
|
|
||||||
lc->wp = NULL;
|
|
||||||
|
|
||||||
return (lc);
|
return (lc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -667,7 +667,7 @@ options_array_first(struct options_entry *o)
|
|||||||
struct options_array_item *
|
struct options_array_item *
|
||||||
options_array_next(struct options_array_item *a)
|
options_array_next(struct options_array_item *a)
|
||||||
{
|
{
|
||||||
return (RB_NEXT(options_array, &o->value.array, a));
|
return (RB_NEXT(options_array, , a));
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *
|
const char *
|
||||||
|
|||||||
Reference in New Issue
Block a user