Merge branch 'obsd-master'

2 files changed, 1 insertions, 3 deletions

diff --git a/cmd-show-options.c b/cmd-show-options.c
index 5d480664..815875d3 100644
--- a/cmd-show-options.c
+++ b/cmd-show-options.c
@@ -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 {
diff --git a/style.c b/style.c
index c3d2960d..92941dbd 100644
--- a/style.c
+++ b/style.c
@@ -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];