Ticket #3598: mc-3598-0003-filemanager-boxes.c-cleanup-Wcast-qual-warning.patch

File mc-3598-0003-filemanager-boxes.c-cleanup-Wcast-qual-warning.patch, 3.9 KB (added by and, 8 years ago)

  • src/filemanager/boxes.c 

    From 577bc207756116813421cebc8076e28dc475d01b Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Sat, 20 Feb 2016 14:42:26 +0000
Subject: [PATCH] filemanager/boxes.c: cleanup -Wcast-qual warning

boxes.c:207:23: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
                       (void *) skin_name, FALSE);
                       ^
boxes.c:218:31: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
                               (void *) skin_name, FALSE);
                               ^
boxes.c:232:54: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
         listbox_get_current (skin_list, &skin_label, (void **) &skin_name);
                                                      ^
--
boxes.c:814:23: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types]
     sort_orders_names = panel_get_sortable_fields (&sort_names_num);
                       ^
boxes.c:851:17: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     g_strfreev ((gchar **) sort_orders_names);
                 ^

Signed-off-by: Andreas Mohr <and@gmx.li>
---
 src/filemanager/boxes.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c
index 6e004f0..a53fe02 100644
    a b sel_skin_button (WButton * button, int action) 
    188188    int result; 
    189189    WListbox *skin_list; 
    190190    WDialog *skin_dlg; 
    191     const gchar *skin_name; 
     191    gchar *skin_name; 
     192    gchar *skin_name_default = g_strdup ("default"); 
    192193    int lxx, lyy; 
    193194    unsigned int i; 
    194195    unsigned int pos = 1; 
    … … sel_skin_button (WButton * button, int action) 
    202203                    DLG_COMPACT); 
    203204 
    204205    skin_list = listbox_new (1, 1, 11, 22, FALSE, NULL); 
    205     skin_name = "default"; 
    206     listbox_add_item (skin_list, LISTBOX_APPEND_AT_END, 0, skin_name_to_label (skin_name), 
    207                       (void *) skin_name, FALSE); 
     206    listbox_add_item (skin_list, LISTBOX_APPEND_AT_END, 0, skin_name_to_label (skin_name_default), 
     207                      (void *) skin_name_default, FALSE); 
    208208 
    209     if (strcmp (skin_name, current_skin_name) == 0) 
     209    if (strcmp (skin_name_default, current_skin_name) == 0) 
    210210        listbox_select_entry (skin_list, 0); 
    211211 
    212212    for (i = 0; i < skin_names->len; i++) 
    213213    { 
    214214        skin_name = g_ptr_array_index (skin_names, i); 
    215         if (strcmp (skin_name, "default") != 0) 
     215        if (strcmp (skin_name, skin_name_default) != 0) 
    216216        { 
    217217            listbox_add_item (skin_list, LISTBOX_APPEND_AT_END, 0, skin_name_to_label (skin_name), 
    218218                              (void *) skin_name, FALSE); 
    … … sel_skin_button (WButton * button, int action) 
    237237        button_set_text (button, str_fit_to_term (skin_label, 20, J_LEFT_FIT)); 
    238238    } 
    239239    dlg_destroy (skin_dlg); 
     240    g_free (skin_name_default); 
    240241 
    241242    return 0; 
    242243} 
    … … panel_listing_box (WPanel * panel, int num, char **userp, char **minip, int *use 
    805806const panel_field_t * 
    806807sort_box (dir_sort_options_t * op, const panel_field_t * sort_field) 
    807808{ 
    808     const char **sort_orders_names; 
     809    char **sort_orders_names; 
    809810    gsize i; 
    810811    gsize sort_names_num = 0; 
    811812    int sort_idx = 0; 
    … … sort_box (dir_sort_options_t * op, const panel_field_t * sort_field) 
    824825        quick_widget_t quick_widgets[] = { 
    825826            /* *INDENT-OFF* */ 
    826827            QUICK_START_COLUMNS, 
    827                 QUICK_RADIO (sort_names_num, sort_orders_names, &sort_idx, NULL), 
     828                QUICK_RADIO (sort_names_num, (const char **)(void *) sort_orders_names, &sort_idx, NULL), 
    828829            QUICK_NEXT_COLUMN, 
    829830                QUICK_CHECKBOX (N_("Executable &first"), &op->exec_first, NULL), 
    830831                QUICK_CHECKBOX (N_("Cas&e sensitive"), &op->case_sensitive, NULL),