[gnome-commander/gcmd-1-10] Switch to const gchar* as second argument in parse_command funtion



commit e77b134f5e1d4395c1cf9eba8e0a05f11255a930
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Tue May 19 19:21:01 2020 +0200

    Switch to const gchar* as second argument in parse_command funtion

 src/gnome-cmd-user-actions.cc | 10 +++++-----
 src/gnome-cmd-user-actions.h  |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index 72d57d76..391efc71 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -725,7 +725,7 @@ void file_edit (GtkMenuItem *menuitem, gpointer not_used)
        string cmd;
        
        cmd.reserve(2000);
-       if (parse_command(&cmd, command) == 0)
+       if (parse_command(&cmd, (const gchar*) command) == 0)
        {
            DEBUG ('g', "Edit file command is not valid.\n");
            gnome_cmd_show_message (*main_win, _("No valid command given."));
@@ -870,7 +870,7 @@ void file_sendto (GtkMenuItem *menuitem, gpointer not_used)
     
     cmd.reserve(2000);
 
-    if (parse_command(&cmd, g_strdup(gnome_cmd_data.options.sendto)) == 0)
+    if (parse_command(&cmd, (const gchar*) gnome_cmd_data.options.sendto) == 0)
     {
            DEBUG ('g', "Sendto command is not valid.\n");
            gnome_cmd_show_message (*main_win, _("No valid command given."));
@@ -1126,7 +1126,7 @@ void command_execute (GtkMenuItem *menuitem, gpointer command)
     }
 
     cmd.reserve(2000);
-    if (parse_command(&cmd, (gchar*) command) == 0)
+    if (parse_command(&cmd, (const gchar*) command) == 0)
     {
        DEBUG ('g', "Command is not valid.\n");
        gnome_cmd_show_message (*main_win, _("No valid command given."));
@@ -2029,7 +2029,7 @@ void help_about (GtkMenuItem *menuitem, gpointer not_used)
  * \param[out] cmd A string with parsed symbols listed above
  * \returns Length of the cmd string
  */
-int parse_command(string *cmd, gchar *command)
+int parse_command(string *cmd, const gchar *command)
 {
     gboolean percent = FALSE;
     gboolean blcheck = FALSE;
@@ -2049,7 +2049,7 @@ int parse_command(string *cmd, gchar *command)
     cmdcap = cmd->capacity();
     cmdlen = cmd->length();
 
-    for (const char *s=(const char *) command; *s; ++s)
+    for (auto s = command; *s; ++s)
     {
         if (!percent)
         {
diff --git a/src/gnome-cmd-user-actions.h b/src/gnome-cmd-user-actions.h
index 4e7a732f..9a1c62e2 100644
--- a/src/gnome-cmd-user-actions.h
+++ b/src/gnome-cmd-user-actions.h
@@ -211,6 +211,7 @@ inline gboolean GnomeCmdUserActions::register_action(guint keyval, const gchar *
     return register_action(0, keyval, action_name_argument, user_data);
 }
 
+int parse_command(string *cmd, const gchar *command);
 
 extern GnomeCmdUserActions gcmd_user_actions;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]