(main): clarify last wd saving, join assignment and declaration, constify

Signed-off-by: Yury V. Zaytsev <[email protected]>

Author: zyv

src/filemanager/filemanager.c

@@ -1831,7 +1831,7 @@ do_nc (void)
 
         // widget_destroy destroys even current_panel->cwd_vpath, so we have to save a copy :)
         if (mc_args__last_wd_file != NULL && vfs_current_is_local ())
-            last_wd_string = g_strdup (vfs_path_as_str (current_panel->cwd_vpath));
+            last_wd_str = g_strdup (vfs_path_as_str (current_panel->cwd_vpath));
 
         // don't handle VFS timestamps for dirs opened in panels
         mc_event_destroy (MCEVENT_GROUP_CORE, "vfs_timestamp");

src/main.c

@@ -498,23 +498,19 @@ main (int argc, char *argv[])
     if (mc_global.tty.console_flag != '\0')
         handle_console (CONSOLE_DONE);
 
-    if (mc_global.mc_run_mode == MC_RUN_FULL && mc_args__last_wd_file != NULL
-        && last_wd_string != NULL && !print_last_revert)
+    if (mc_global.mc_run_mode == MC_RUN_FULL && mc_args__last_wd_file != NULL && last_wd_str != NULL
+        && !print_last_revert)
     {
-        int last_wd_fd;
-
-        last_wd_fd = open (mc_args__last_wd_file, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+        const int last_wd_fd =
+            open (mc_args__last_wd_file, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
         if (last_wd_fd != -1)
         {
-            ssize_t ret1;
-            int ret2;
-            ret1 = write (last_wd_fd, last_wd_string, strlen (last_wd_string));
-            ret2 = close (last_wd_fd);
-            (void) ret1;
-            (void) ret2;
+            MC_UNUSED const ssize_t ret1 = write (last_wd_fd, last_wd_str, strlen (last_wd_str));
+            MC_UNUSED const int ret2 = close (last_wd_fd);
         }
     }
-    g_free (last_wd_string);
+
+    g_free (last_wd_str);
 
     mc_shell_deinit ();
 

src/setup.c

@@ -196,7 +196,7 @@ char *spell_language = NULL;
 char *saved_other_dir = NULL;
 
 /* If set, then print to the given file the last directory we were at */
-char *last_wd_string = NULL;
+char *last_wd_str = NULL;
 
 /* Set when main loop should be terminated */
 int quit = 0;

src/setup.h

@@ -125,7 +125,7 @@ extern char *spell_language;
 extern char *saved_other_dir;
 
 /* If set, then print to the given file the last directory we were at */
-extern char *last_wd_string;
+extern char *last_wd_str;
 
 extern int quit;
 /* Set to TRUE to suppress printing the last directory */