Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2019-04-05 23:02:36 +01:00
commit 04402db616
2 changed files with 1 additions and 3 deletions

View File

@ -165,13 +165,11 @@ cmd_show_options_all(struct cmd *self, struct cmdq_item *item,
struct options *oo)
{
struct options_entry *o;
const struct options_table_entry *oe;
struct options_array_item *a;
u_int idx;
o = options_first(oo);
while (o != NULL) {
oe = options_table_entry(o);
if (!options_isarray(o))
cmd_show_options_print(self, item, o, -1);
else {

View File

@ -172,7 +172,7 @@ style_tostring(struct style *sy)
{
struct grid_cell *gc = &sy->gc;
int off = 0;
const char *comma = "", *tmp;
const char *comma = "", *tmp = "";
static char s[256];
char b[16];