From d371764d022b6c074f967faee815c3117203451e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 21 Aug 2021 08:44:59 +0000
Subject: Wrap command argument definitions in their own struct.

---
 tmux.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index a28deb74..43881c1d 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1365,6 +1365,13 @@ struct args_value {
 struct args_entry;
 RB_HEAD(args_tree, args_entry);
 
+/* Arguments parsing state. */
+struct args_parse {
+	const char	*template;
+	int		 lower;
+	int		 upper;
+};
+
 /* Command find structures. */
 enum cmd_find_type {
 	CMD_FIND_PANE,
@@ -1453,11 +1460,7 @@ struct cmd_entry {
 	const char		*name;
 	const char		*alias;
 
-	struct {
-		const char	*template;
-		int		 lower;
-		int		 upper;
-	} args;
+	struct args_parse	 args;
 	const char		*usage;
 
 	struct cmd_entry_flag	 source;
@@ -2183,7 +2186,7 @@ int		tty_keys_next(struct tty *);
 /* arguments.c */
 void		 args_set(struct args *, u_char, const char *);
 struct args 	*args_create(void);
-struct args	*args_parse(const char *, int, char **, int, int);
+struct args	*args_parse(const struct args_parse *, int, char **);
 void		 args_vector(struct args *, int *, char ***);
 void		 args_free(struct args *);
 char		*args_print(struct args *);
-- 
cgit 


From 08e6360f23284c9e2e521cb466002bdd9350a63d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 21 Aug 2021 10:22:38 +0000
Subject: Add args parsing callback for some future work, currently unused.

---
 tmux.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 43881c1d..af3e3a84 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1366,10 +1366,12 @@ struct args_entry;
 RB_HEAD(args_tree, args_entry);
 
 /* Arguments parsing state. */
+typedef enum args_type (*args_parse_cb)(struct args *, u_int);
 struct args_parse {
 	const char	*template;
 	int		 lower;
 	int		 upper;
+	args_parse_cb	 cb;
 };
 
 /* Command find structures. */
-- 
cgit 


From 110ba767e591946d6784acef87737850f2ad3ae9 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 21 Aug 2021 10:28:05 +0000
Subject: Rename a member to match what it will be in future.

---
 tmux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index af3e3a84..fb1631f9 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1357,7 +1357,7 @@ TAILQ_HEAD(message_list, message_entry);
 
 /* Argument value. */
 struct args_value {
-	char			*value;
+	char			*string;
 	TAILQ_ENTRY(args_value)	 entry;
 };
 
-- 
cgit