Rename a member to match what it will be in future.

diff --git a/usr.bin/tmux/arguments.c b/usr.bin/tmux/arguments.c
index b38b074..eee3ba7 100644 (file)
--- a/usr.bin/tmux/arguments.c
+++ b/usr.bin/tmux/arguments.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arguments.c,v 1.40 2021/08/21 08:44:59 nicm Exp $ */
+/* $OpenBSD: arguments.c,v 1.41 2021/08/21 10:28:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -128,7 +128,7 @@ args_free(struct args *args)
                RB_REMOVE(args_tree, &args->tree, entry);
                TAILQ_FOREACH_SAFE(value, &entry->values, entry, value1) {
                        TAILQ_REMOVE(&entry->values, value, entry);
-                       free(value->value);
+                       free(value->string);
                        free(value);
                }
                free(entry);
@@ -210,7 +210,7 @@ args_print(struct args *args)
                                args_print_add(&buf, &len, " -%c", entry->flag);
                        else
                                args_print_add(&buf, &len, "-%c", entry->flag);
-                       args_print_add_argument(&buf, &len, value->value);
+                       args_print_add_argument(&buf, &len, value->string);
                }
        }
 
@@ -299,7 +299,7 @@ args_set(struct args *args, u_char flag, const char *s)
 
        if (s != NULL) {
                value = xcalloc(1, sizeof *value);
-               value->value = xstrdup(s);
+               value->string = xstrdup(s);
                TAILQ_INSERT_TAIL(&entry->values, value, entry);
        }
 }
@@ -314,7 +314,7 @@ args_get(struct args *args, u_char flag)
                return (NULL);
        if (TAILQ_EMPTY(&entry->values))
                return (NULL);
-       return (TAILQ_LAST(&entry->values, args_values)->value);
+       return (TAILQ_LAST(&entry->values, args_values)->string);
 }
 
 /* Get first argument. */
@@ -387,7 +387,7 @@ args_strtonum(struct args *args, u_char flag, long long minval,
        }
        value = TAILQ_LAST(&entry->values, args_values);
 
-       ll = strtonum(value->value, minval, maxval, &errstr);
+       ll = strtonum(value->string, minval, maxval, &errstr);
        if (errstr != NULL) {
                *cause = xstrdup(errstr);
                return (0);
@@ -409,7 +409,7 @@ args_percentage(struct args *args, u_char flag, long long minval,
                *cause = xstrdup("missing");
                return (0);
        }
-       value = TAILQ_LAST(&entry->values, args_values)->value;
+       value = TAILQ_LAST(&entry->values, args_values)->string;
        return (args_string_percentage(value, minval, maxval, curval, cause));
 }
 

diff --git a/usr.bin/tmux/cmd-new-session.c b/usr.bin/tmux/cmd-new-session.c
index 1e9e9cc..5a3eba8 100644 (file)
--- a/usr.bin/tmux/cmd-new-session.c
+++ b/usr.bin/tmux/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-new-session.c,v 1.142 2021/08/21 10:22:39 nicm Exp $ */
+/* $OpenBSD: cmd-new-session.c,v 1.143 2021/08/21 10:28:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -271,7 +271,7 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
                environ_update(global_s_options, c->environ, env);
        av = args_first_value(args, 'e');
        while (av != NULL) {
-               environ_put(env, av->value, 0);
+               environ_put(env, av->string, 0);
                av = args_next_value(av);
        }
        s = session_create(prefix, newname, cwd, env, oo, tiop);

diff --git a/usr.bin/tmux/cmd-new-window.c b/usr.bin/tmux/cmd-new-window.c
index 282b6a8..aab1938 100644 (file)
--- a/usr.bin/tmux/cmd-new-window.c
+++ b/usr.bin/tmux/cmd-new-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-new-window.c,v 1.94 2021/08/21 10:22:39 nicm Exp $ */
+/* $OpenBSD: cmd-new-window.c,v 1.95 2021/08/21 10:28:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -110,7 +110,7 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
 
        av = args_first_value(args, 'e');
        while (av != NULL) {
-               environ_put(sc.environ, av->value, 0);
+               environ_put(sc.environ, av->string, 0);
                av = args_next_value(av);
        }
 

diff --git a/usr.bin/tmux/cmd-queue.c b/usr.bin/tmux/cmd-queue.c
index 98577a0..5ec234b 100644 (file)
--- a/usr.bin/tmux/cmd-queue.c
+++ b/usr.bin/tmux/cmd-queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-queue.c,v 1.105 2021/08/20 19:50:16 nicm Exp $ */
+/* $OpenBSD: cmd-queue.c,v 1.106 2021/08/21 10:28:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -413,7 +413,7 @@ cmdq_insert_hook(struct session *s, struct cmdq_item *item,
                av = args_first_value(args, flag);
                while (av != NULL) {
                        xsnprintf(tmp, sizeof tmp, "hook_flag_%c_%d", flag, i);
-                       cmdq_add_format(new_state, tmp, "%s", av->value);
+                       cmdq_add_format(new_state, tmp, "%s", av->string);
                        i++;
                        av = args_next_value(av);
                }

diff --git a/usr.bin/tmux/cmd-refresh-client.c b/usr.bin/tmux/cmd-refresh-client.c
index 4702346..5520d56 100644 (file)
--- a/usr.bin/tmux/cmd-refresh-client.c
+++ b/usr.bin/tmux/cmd-refresh-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-refresh-client.c,v 1.43 2021/08/21 10:22:39 nicm Exp $ */
+/* $OpenBSD: cmd-refresh-client.c,v 1.44 2021/08/21 10:28:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -187,7 +187,7 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
                        goto not_control_client;
                av = args_first_value(args, 'A');
                while (av != NULL) {
-                       cmd_refresh_client_update_offset(tc, av->value);
+                       cmd_refresh_client_update_offset(tc, av->string);
                        av = args_next_value(av);
                }
                return (CMD_RETURN_NORMAL);
@@ -197,7 +197,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->value);
+                       cmd_refresh_client_update_subscription(tc, av->string);
                        av = args_next_value(av);
                }
                return (CMD_RETURN_NORMAL);

diff --git a/usr.bin/tmux/cmd-resize-pane.c b/usr.bin/tmux/cmd-resize-pane.c
index d782d85..8223026 100644 (file)
--- a/usr.bin/tmux/cmd-resize-pane.c
+++ b/usr.bin/tmux/cmd-resize-pane.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-resize-pane.c,v 1.50 2021/08/21 10:22:39 nicm Exp $ */
+/* $OpenBSD: cmd-resize-pane.c,v 1.51 2021/08/21 10:28:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -98,8 +98,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmdq_item *item)
        if (args_count(args) == 0)
                adjust = 1;
        else {
-               adjust = strtonum(args_string(args, 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);

diff --git a/usr.bin/tmux/cmd-resize-window.c b/usr.bin/tmux/cmd-resize-window.c
index 35af7da..ec523fb 100644 (file)
--- a/usr.bin/tmux/cmd-resize-window.c
+++ b/usr.bin/tmux/cmd-resize-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-resize-window.c,v 1.7 2021/08/21 10:22:39 nicm Exp $ */
+/* $OpenBSD: cmd-resize-window.c,v 1.8 2021/08/21 10:28:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2018 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -59,8 +59,7 @@ cmd_resize_window_exec(struct cmd *self, struct cmdq_item *item)
        if (args_count(args) == 0)
                adjust = 1;
        else {
-               adjust = strtonum(args_string(args, 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);

diff --git a/usr.bin/tmux/cmd-respawn-pane.c b/usr.bin/tmux/cmd-respawn-pane.c
index 73d4e90..93e8d65 100644 (file)
--- a/usr.bin/tmux/cmd-respawn-pane.c
+++ b/usr.bin/tmux/cmd-respawn-pane.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-respawn-pane.c,v 1.36 2021/08/21 10:22:39 nicm Exp $ */
+/* $OpenBSD: cmd-respawn-pane.c,v 1.37 2021/08/21 10:28:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -69,7 +69,7 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmdq_item *item)
 
        av = args_first_value(args, 'e');
        while (av != NULL) {
-               environ_put(sc.environ, av->value, 0);
+               environ_put(sc.environ, av->string, 0);
                av = args_next_value(av);
        }
 

diff --git a/usr.bin/tmux/cmd-respawn-window.c b/usr.bin/tmux/cmd-respawn-window.c
index abac7a7..31b4359 100644 (file)
--- a/usr.bin/tmux/cmd-respawn-window.c
+++ b/usr.bin/tmux/cmd-respawn-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-respawn-window.c,v 1.47 2021/08/21 10:22:39 nicm Exp $ */
+/* $OpenBSD: cmd-respawn-window.c,v 1.48 2021/08/21 10:28:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -67,7 +67,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item)
 
        av = args_first_value(args, 'e');
        while (av != NULL) {
-               environ_put(sc.environ, av->value, 0);
+               environ_put(sc.environ, av->string, 0);
                av = args_next_value(av);
        }
 

diff --git a/usr.bin/tmux/cmd-split-window.c b/usr.bin/tmux/cmd-split-window.c
index ce8d934..909c6bb 100644 (file)
--- a/usr.bin/tmux/cmd-split-window.c
+++ b/usr.bin/tmux/cmd-split-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-split-window.c,v 1.108 2021/08/21 10:22:39 nicm Exp $ */
+/* $OpenBSD: cmd-split-window.c,v 1.109 2021/08/21 10:28:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -142,7 +142,7 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 
        av = args_first_value(args, 'e');
        while (av != NULL) {
-               environ_put(sc.environ, av->value, 0);
+               environ_put(sc.environ, av->string, 0);
                av = args_next_value(av);
        }
 

diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 5f99789..5a937ad 100644 (file)
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1129 2021/08/21 10:22:39 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1130 2021/08/21 10:28:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1357,7 +1357,7 @@ TAILQ_HEAD(message_list, message_entry);
 
 /* Argument value. */
 struct args_value {
-       char                    *value;
+       char                    *string;
        TAILQ_ENTRY(args_value)  entry;
 };