aboutsummaryrefslogtreecommitdiff
path: root/grid.c
diff options
context:
space:
mode:
authorThomas <thomas@xteddy.org>2014-01-20 10:48:12 +0000
committerThomas <thomas@xteddy.org>2014-01-20 10:48:12 +0000
commitd02c4bda3a4b456f654fb0c1b454ba9724bff0f3 (patch)
tree95f3d17d7f1525e05ed298a015166af557988a0e /grid.c
parentba014c1a605f78b301b47ef922dd24a3c5c2c4c1 (diff)
parent938768ed3de3e38cb96344b8ec7b794b5e828acf (diff)
downloadrtmux-d02c4bda3a4b456f654fb0c1b454ba9724bff0f3.tar.gz
rtmux-d02c4bda3a4b456f654fb0c1b454ba9724bff0f3.tar.bz2
rtmux-d02c4bda3a4b456f654fb0c1b454ba9724bff0f3.zip
Merge branch 'obsd-master'
Diffstat (limited to 'grid.c')
-rw-r--r--grid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/grid.c b/grid.c
index 9e800243..15c3018b 100644
--- a/grid.c
+++ b/grid.c
@@ -124,7 +124,7 @@ grid_compare(struct grid *ga, struct grid *gb)
struct grid_cell *gca, *gcb;
u_int xx, yy;
- if (ga->sx != gb->sx || ga->sy != ga->sy)
+ if (ga->sx != gb->sx || ga->sy != gb->sy)
return (1);
for (yy = 0; yy < ga->sy; yy++) {
@@ -644,7 +644,7 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
if (trim) {
while (off > 0 && buf[off - 1] == ' ')
off--;
- }
+ }
buf[off] = '\0';
return (buf);