From: Orestis Floros <orestisf1993@gmail.com>
Date: Sun, 10 Dec 2017 20:08:46 +0000 (+0200)
Subject: cmd_move_con_to_workspace_number: rename workspace->ws
X-Git-Tag: 4.15~14^2
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=e0f15796692d5d76c7046d83ebc2786a965ea4f0

cmd_move_con_to_workspace_number: rename workspace->ws

For consistency with other cmd_move_con_to_workspace* functions.
---

diff --git a/src/commands.c b/src/commands.c
index 5bfdc96a..02d14daa 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -403,7 +403,7 @@ void cmd_move_con_to_workspace_number(I3_CMD, const char *which, const char *_no
 
     LOG("should move window to workspace %s\n", which);
     /* get the workspace */
-    Con *output, *workspace = NULL;
+    Con *output, *ws = NULL;
 
     long parsed_num = ws_name_to_number(which);
 
@@ -414,19 +414,19 @@ void cmd_move_con_to_workspace_number(I3_CMD, const char *which, const char *_no
     }
 
     TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
-    GREP_FIRST(workspace, output_get_content(output),
+    GREP_FIRST(ws, output_get_content(output),
                child->num == parsed_num);
 
-    if (!workspace) {
-        workspace = workspace_get(which, NULL);
+    if (!ws) {
+        ws = workspace_get(which, NULL);
     }
 
     if (!no_auto_back_and_forth)
-        workspace = maybe_auto_back_and_forth_workspace(workspace);
+        ws = maybe_auto_back_and_forth_workspace(ws);
 
     HANDLE_EMPTY_MATCH;
 
-    move_matches_to_workspace(workspace);
+    move_matches_to_workspace(ws);
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply