===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- src/usr.bin/tmux/format.c	2019/12/26 11:04:58	1.221
+++ src/usr.bin/tmux/format.c	2019/12/26 14:48:29	1.222
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.221 2019/12/26 11:04:58 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.222 2019/12/26 14:48:29 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1150,12 +1150,12 @@
     void *), void *arg)
 {
 	struct format_entry	*fe;
-	static char		 s[64];
+	char			 s[64];
 
 	RB_FOREACH(fe, format_entry_tree, &ft->tree) {
 		if (fe->t != 0) {
 			xsnprintf(s, sizeof s, "%lld", (long long)fe->t);
-			cb(fe->key, fe->value, s);
+			cb(fe->key, s, arg);
 		} else {
 			if (fe->value == NULL && fe->cb != NULL) {
 				fe->cb(ft, fe);
@@ -1198,8 +1198,7 @@
 static void
 format_add_tv(struct format_tree *ft, const char *key, struct timeval *tv)
 {
-	struct format_entry	*fe;
-	struct format_entry	*fe_now;
+	struct format_entry	*fe, *fe_now;
 
 	fe = xmalloc(sizeof *fe);
 	fe->key = xstrdup(key);