From a1fc8f8b23bf6371877ff93e123b735d2c7d596d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 9 Apr 2020 15:35:27 +0000
Subject: More style nits.

---
 format.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'format.c')

diff --git a/format.c b/format.c
index 24710f15..efbf5c62 100644
--- a/format.c
+++ b/format.c
@@ -1617,7 +1617,7 @@ format_build_modifiers(struct format_tree *ft, const char **s, u_int *count)
 		return (NULL);
 	}
 	*s = cp + 1;
-	return list;
+	return (list);
 }
 
 /* Match against an fnmatch(3) pattern or regular expression. */
@@ -1909,7 +1909,7 @@ format_replace_expression(struct format_modifier *mexp, struct format_tree *ft,
 
 	free(right);
 	free(left);
-	return value;
+	return (value);
 
 fail:
 	free(right);
-- 
cgit 


From c20eb0c0ae3347c768894a6355adfd7ebae6f2f3 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Apr 2020 08:26:27 +0000
Subject: Make struct cmd local to cmd.c and move it out of tmux.h.

---
 format.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'format.c')

diff --git a/format.c b/format.c
index efbf5c62..2d8522c9 100644
--- a/format.c
+++ b/format.c
@@ -1128,8 +1128,10 @@ format_create_add_item(struct format_tree *ft, struct cmdq_item *item)
 	struct window_pane	*wp;
 	u_int			 x, y;
 
-	if (item->cmd != NULL)
-		format_add(ft, "command", "%s", item->cmd->entry->name);
+	if (item->cmd != NULL) {
+		format_add(ft, "command", "%s",
+		    cmd_get_entry (item->cmd)->name);
+	}
 
 	if (item->shared == NULL)
 		return;
-- 
cgit