Ticket #3598: mc-3598-0015-utilunix.c-cleanup-Wcast-qual-warning.patch

File mc-3598-0015-utilunix.c-cleanup-Wcast-qual-warning.patch, 2.3 KB (added by and, 8 years ago)
  • lib/utilunix.c

    From d8b935c509254f6a3523184a59fb40837bea398a Mon Sep 17 00:00:00 2001
    From: Andreas Mohr <and@gmx.li>
    Date: Sat, 20 Feb 2016 11:27:18 +0000
    Subject: [PATCH] utilunix.c: cleanup -Wcast-qual warning
    
    utilunix.c:218:38: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
             g_ptr_array_add (args_array, (gpointer) shell);
                                          ^
    utilunix.c:219:38: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
             g_ptr_array_add (args_array, (gpointer) "-c");
                                          ^
    utilunix.c:232:38: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
             g_ptr_array_add (args_array, (gpointer) shell);
                                          ^
    
    Signed-off-by: Andreas Mohr <and@gmx.li>
    ---
     lib/utilunix.c | 9 +++++----
     1 file changed, 5 insertions(+), 4 deletions(-)
    
    diff --git a/lib/utilunix.c b/lib/utilunix.c
    index f4a81d5..ed873f5 100644
    a b my_system_make_arg_array (int flags, const char *shell, char **execute_name) 
    215215 
    216216    if ((flags & EXECUTE_AS_SHELL) != 0) 
    217217    { 
    218         g_ptr_array_add (args_array, (gpointer) shell); 
    219         g_ptr_array_add (args_array, (gpointer) "-c"); 
     218        g_ptr_array_add (args_array, g_strdup (shell)); 
     219        g_ptr_array_add (args_array, g_strdup ("-c")); 
    220220        *execute_name = g_strdup (shell); 
    221221    } 
    222222    else 
    my_system_make_arg_array (int flags, const char *shell, char **execute_name) 
    229229        else 
    230230            *execute_name = g_strndup (shell, (gsize) (shell_token - shell)); 
    231231 
    232         g_ptr_array_add (args_array, (gpointer) shell); 
     232        g_ptr_array_add (args_array, g_strdup (shell)); 
    233233    } 
    234234    return args_array; 
    235235} 
    my_systemv_flags (int flags, const char *command, char *const argv[]) 
    485485    args_array = my_system_make_arg_array (flags, command, &execute_name); 
    486486 
    487487    for (; argv != NULL && *argv != NULL; argv++) 
    488         g_ptr_array_add (args_array, *argv); 
     488        g_ptr_array_add (args_array, g_strdup (*argv)); 
    489489 
    490490    g_ptr_array_add (args_array, NULL); 
    491491    status = my_systemv (execute_name, (char *const *) args_array->pdata); 
    492492 
    493493    g_free (execute_name); 
     494    g_ptr_array_foreach (args_array, (GFunc) g_free, NULL); 
    494495    g_ptr_array_free (args_array, TRUE); 
    495496 
    496497    return status;