Fix warnings, from Jan Tache in GitHub issue 2692.

4 files changed, 7 insertions, 6 deletions

diff --git a/format.c b/format.c
index 5a12502e..c7960819 100644
--- a/format.c
+++ b/format.c
@@ -4199,7 +4199,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
 			value = xstrdup("0");
 		} else {
 			format_log(es, "search '%s' pane %%%u", new, wp->id);
-			value = format_search(fm, wp, new);
+			value = format_search(search, wp, new);
 		}
 		free(new);
 	} else if (cmp != NULL) {
diff --git a/server.c b/server.c
index 0b878d9e..29bcf88a 100644
--- a/server.c
+++ b/server.c
@@ -163,7 +163,8 @@ server_tidy_event(__unused int fd, __unused short events, __unused void *data)
     malloc_trim(0);
 #endif
 
-    log_debug("%s: took %llu milliseconds", __func__, get_timer() - t);
+    log_debug("%s: took %llu milliseconds", __func__,
+        (unsigned long long)(get_timer() - t));
     evtimer_add(&server_ev_tidy, &tv);
 }
 
diff --git a/tty-term.c b/tty-term.c
index 4a7e7415..add71d89 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -697,7 +697,7 @@ tty_term_read_list(const char *name, int fd, char ***caps, u_int *ncaps,
 		ent = &tty_term_codes[i];
 		switch (ent->type) {
 		case TTYCODE_NONE:
-			break;
+			continue;
 		case TTYCODE_STRING:
 			s = tigetstr((char *)ent->name);
 			if (s == NULL || s == (char *)-1)
diff --git a/window-buffer.c b/window-buffer.c
index 8d93558a..c1ddcc74 100644
--- a/window-buffer.c
+++ b/window-buffer.c
@@ -294,9 +294,9 @@ window_buffer_get_key(void *modedata, void *itemdata, u_int line)
 	struct window_buffer_modedata	*data = modedata;
 	struct window_buffer_itemdata	*item = itemdata;
 	struct format_tree		*ft;
-	struct session			*s;
-	struct winlink			*wl;
-	struct window_pane		*wp;
+	struct session			*s = NULL;
+	struct winlink			*wl = NULL;
+	struct window_pane		*wp = NULL;
 	struct paste_buffer		*pb;
 	char				*expanded;
 	key_code			 key;