From 90dd474c3ea8bf10bde6ee15eaaf9f3af3fb46f6 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 20 Aug 2021 18:59:53 +0000
Subject: Expose args_value struct (will be needed soon) and add some missing
 frees.

---
 cmd-refresh-client.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'cmd-refresh-client.c')

diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c
index e55ce907..2ade072f 100644
--- a/cmd-refresh-client.c
+++ b/cmd-refresh-client.c
@@ -184,20 +184,20 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
 	if (args_has(args, 'A')) {
 		if (~tc->flags & CLIENT_CONTROL)
 			goto not_control_client;
-		value = args_first_value(args, 'A', &av);
-		while (value != NULL) {
-			cmd_refresh_client_update_offset(tc, value);
-			value = args_next_value(&av);
+		av = args_first_value(args, 'A');
+		while (av != NULL) {
+			cmd_refresh_client_update_offset(tc, av->value);
+			av = args_next_value(&av);
 		}
 		return (CMD_RETURN_NORMAL);
 	}
 	if (args_has(args, 'B')) {
 		if (~tc->flags & CLIENT_CONTROL)
 			goto not_control_client;
-		value = args_first_value(args, 'B', &av);
-		while (value != NULL) {
-			cmd_refresh_client_update_subscription(tc, value);
-			value = args_next_value(&av);
+		av = args_first_value(args, 'B');
+		while (av != NULL) {
+			cmd_refresh_client_update_subscription(tc, av);
+			av = args_next_value(av);
 		}
 		return (CMD_RETURN_NORMAL);
 	}
-- 
cgit 


From de94a344f61b0e4ef6459c11621be3c3d1683c9e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 20 Aug 2021 19:34:51 +0000
Subject: Add a couple of const and fix some warnings.

---
 cmd-refresh-client.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cmd-refresh-client.c')

diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c
index 2ade072f..22efb38b 100644
--- a/cmd-refresh-client.c
+++ b/cmd-refresh-client.c
@@ -117,7 +117,7 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
 	struct client		*tc = cmdq_get_target_client(item);
 	struct tty		*tty = &tc->tty;
 	struct window		*w;
-	const char		*size, *errstr, *value;
+	const char		*size, *errstr;
 	u_int			 x, y, adjust;
 	struct args_value	*av;
 
@@ -187,7 +187,7 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
 		av = args_first_value(args, 'A');
 		while (av != NULL) {
 			cmd_refresh_client_update_offset(tc, av->value);
-			av = args_next_value(&av);
+			av = args_next_value(av);
 		}
 		return (CMD_RETURN_NORMAL);
 	}
@@ -196,7 +196,7 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
 			goto not_control_client;
 		av = args_first_value(args, 'B');
 		while (av != NULL) {
-			cmd_refresh_client_update_subscription(tc, av);
+			cmd_refresh_client_update_subscription(tc, av->value);
 			av = args_next_value(av);
 		}
 		return (CMD_RETURN_NORMAL);
-- 
cgit 


From 5f32b7d9613e9ef3f8198302379a42630323da6a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 20 Aug 2021 19:50:16 +0000
Subject: Hide struct args behind a couple of accessor functions.

---
 cmd-refresh-client.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cmd-refresh-client.c')

diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c
index 22efb38b..93845024 100644
--- a/cmd-refresh-client.c
+++ b/cmd-refresh-client.c
@@ -127,10 +127,11 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
 	    args_has(args, 'U') ||
 	    args_has(args, 'D'))
 	{
-		if (args->argc == 0)
+		if (args_count(args) == 0)
 			adjust = 1;
 		else {
-			adjust = strtonum(args->argv[0], 1, INT_MAX, &errstr);
+			adjust = strtonum(args_string(args, 0), 1, INT_MAX,
+			    &errstr);
 			if (errstr != NULL) {
 				cmdq_error(item, "adjustment %s", errstr);
 				return (CMD_RETURN_ERROR);
-- 
cgit