Use the right format modifier when comparing, and remove a couple of

unused variables.
This commit is contained in:
nicm 2019-06-15 06:33:48 +00:00
parent c95cd9ed5e
commit 03da0ced46
2 changed files with 3 additions and 4 deletions

View File

@ -1700,7 +1700,7 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
else else
value = xstrdup("0"); value = xstrdup("0");
} else if (strcmp(cmp->modifier, "m") == 0) } else if (strcmp(cmp->modifier, "m") == 0)
value = format_match(fm, left, right); value = format_match(cmp, left, right);
free(right); free(right);
free(left); free(left);

View File

@ -122,7 +122,7 @@ layout_parse(struct window *w, const char *layout)
{ {
struct layout_cell *lc, *lcchild; struct layout_cell *lc, *lcchild;
struct window_pane *wp; struct window_pane *wp;
u_int npanes, ncells, sx, sy; u_int npanes, ncells;
u_short csum; u_short csum;
/* Check validity. */ /* Check validity. */
@ -153,8 +153,7 @@ layout_parse(struct window *w, const char *layout)
layout_destroy_cell(w, lcchild, &lc); layout_destroy_cell(w, lcchild, &lc);
} }
/* Save the old window size and resize to the layout size. */ /* Resize to the layout size. */
sx = w->sx; sy = w->sy;
window_resize(w, lc->sx, lc->sy); window_resize(w, lc->sx, lc->sy);
/* Destroy the old layout and swap to the new. */ /* Destroy the old layout and swap to the new. */