Merge branch 'obsd-master'

2 files changed, 2 insertions, 4 deletions

diff --git a/cmd-queue.c b/cmd-queue.c
index 93dcaa53..1ee43508 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -202,7 +202,7 @@ cmdq_get_command(struct cmd_list *cmdlist, struct cmd_find_state *current,
 {
 	struct cmdq_item	*item, *first = NULL, *last = NULL;
 	struct cmd		*cmd;
-	struct cmdq_shared	*shared;
+	struct cmdq_shared	*shared = NULL;
 	u_int			 group = 0;
 
 	TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
diff --git a/format.c b/format.c
index 45479d5e..5ca970b7 100644
--- a/format.c
+++ b/format.c
@@ -1518,7 +1518,7 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
     char **buf, size_t *len, size_t *off)
 {
 	struct window_pane	*wp = ft->wp;
-	const char		*errptr, *copy, *cp, *marker;
+	const char		*errptr, *copy, *cp, *marker = NULL;
 	char			*copy0, *condition, *found, *new;
 	char			*value, *left, *right;
 	size_t			 valuelen;
@@ -1566,8 +1566,6 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
 					limit = 0;
 				if (fm->argc == 2 && fm->argv[1] != NULL)
 					marker = fm->argv[1];
-				else
-					marker = NULL;
 				break;
 			case 'l':
 				modifiers |= FORMAT_LITERAL;