From b5fda7ad2a3a45e9a4d54d929b03a6b28bf67c37 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 25 Mar 2013 12:00:30 +0000 Subject: [PATCH] Spacing, warning nits. --- cmd.c | 2 +- grid.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd.c b/cmd.c index c8e9702d..eecac462 100644 --- a/cmd.c +++ b/cmd.c @@ -1242,7 +1242,7 @@ cmd_find_pane_offset(const char *paneptr, struct winlink *wl) char * cmd_template_replace(const char *template, const char *s, int idx) { - char ch, *buf; + char ch, *buf; const char *ptr; int replaced; size_t len; diff --git a/grid.c b/grid.c index 551a7dc9..2955e8ba 100644 --- a/grid.c +++ b/grid.c @@ -725,7 +725,7 @@ void grid_reflow_split(struct grid *dst, u_int *py, struct grid_line *src_gl, u_int new_x, u_int offset) { - struct grid_line *dst_gl; + struct grid_line *dst_gl = NULL; u_int to_copy; /* Loop and copy sections of the source line. */ @@ -756,7 +756,8 @@ grid_reflow_split(struct grid *dst, u_int *py, struct grid_line *src_gl, } /* Last line is not wrapped. */ - dst_gl->flags &= ~GRID_LINE_WRAPPED; + if (dst_gl != NULL) + dst_gl->flags &= ~GRID_LINE_WRAPPED; } /* Move line data. */