Ticket #3598: mc-3598-0008-tty-key.c-cleanup-Wcast-qual-warning.patch

File mc-3598-0008-tty-key.c-cleanup-Wcast-qual-warning.patch, 4.4 KB (added by and, 8 years ago)

  • lib/tty/key.c 

    From 5f93cec12c6e0c0171f148e4525ef9bf02c1d584 Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Sat, 20 Feb 2016 09:54:31 +0000
Subject: [PATCH] tty/key.c: cleanup -Wcast-qual warning

key.c:1211:34: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     const key_code_name_t *n1 = *(const key_code_name_t **) p1;
                                  ^
key.c:1212:34: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     const key_code_name_t *n2 = *(const key_code_name_t **) p2;
                                  ^
key.c:1222:34: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     const key_code_name_t *n1 = *(const key_code_name_t **) p1;
                                  ^
key.c:1223:34: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     const key_code_name_t *n2 = *(const key_code_name_t **) p2;
                                  ^
key.c:1277:33: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
             *idx = (int) (res - (key_code_name_t **) key_conv_tab_sorted);
                                 ^
key.c:1304:33: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
             *idx = (int) (res - (key_code_name_t **) key_conv_tab_sorted);
                                 ^
key.c:1480:13: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     g_free ((char *) name);
             ^

Signed-off-by: Andreas Mohr <and@gmx.li>
---
 lib/tty/key.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/tty/key.c b/lib/tty/key.c
index 194dcb4..6d42daa 100644
    a b s_dispose (SelectList * sel) 
    12081208static int 
    12091209key_code_comparator_by_name (const void *p1, const void *p2) 
    12101210{ 
    1211     const key_code_name_t *n1 = *(const key_code_name_t **) p1; 
    1212     const key_code_name_t *n2 = *(const key_code_name_t **) p2; 
     1211    const key_code_name_t *n1 = *(const key_code_name_t *const *) p1; 
     1212    const key_code_name_t *n2 = *(const key_code_name_t *const *) p2; 
    12131213 
    12141214    return g_ascii_strcasecmp (n1->name, n2->name); 
    12151215} 
    … … key_code_comparator_by_name (const void *p1, const void *p2) 
    12191219static int 
    12201220key_code_comparator_by_code (const void *p1, const void *p2) 
    12211221{ 
    1222     const key_code_name_t *n1 = *(const key_code_name_t **) p1; 
    1223     const key_code_name_t *n2 = *(const key_code_name_t **) p2; 
     1222    const key_code_name_t *n1 = *(const key_code_name_t *const *) p1; 
     1223    const key_code_name_t *n2 = *(const key_code_name_t *const *) p2; 
    12241224 
    12251225    return n1->code - n2->code; 
    12261226} 
    … … lookup_keyname (const char *name, int *idx) 
    12591259    { 
    12601260        const key_code_name_t key = { 0, name, NULL, NULL }; 
    12611261        const key_code_name_t *keyp = &key; 
    1262         key_code_name_t **res; 
     1262        const key_code_name_t **res; 
    12631263 
    12641264        if (name[1] == '\0') 
    12651265        { 
    … … lookup_keyname (const char *name, int *idx) 
    12741274 
    12751275        if (res != NULL) 
    12761276        { 
    1277             *idx = (int) (res - (key_code_name_t **) key_conv_tab_sorted); 
     1277            *idx = (int) (res - key_conv_tab_sorted); 
    12781278            return (*res)->code; 
    12791279        } 
    12801280    } 
    … … lookup_keycode (const long code, int *idx) 
    12921292    { 
    12931293        const key_code_name_t key = { code, NULL, NULL, NULL }; 
    12941294        const key_code_name_t *keyp = &key; 
    1295         key_code_name_t **res; 
     1295        const key_code_name_t **res; 
    12961296 
    12971297        sort_key_conv_tab (KEY_SORTBYCODE); 
    12981298 
    … … lookup_keycode (const long code, int *idx) 
    13011301 
    13021302        if (res != NULL) 
    13031303        { 
    1304             *idx = (int) (res - (key_code_name_t **) key_conv_tab_sorted); 
     1304            *idx = (int) (res - key_conv_tab_sorted); 
    13051305            return TRUE; 
    13061306        } 
    13071307    } 
    … … long 
    14641464lookup_key (const char *name, char **label) 
    14651465{ 
    14661466    char **lc_keys, **p; 
     1467    char *cname; 
    14671468    int k = -1; 
    14681469    int key = 0; 
    14691470    int lc_index = -1; 
    … … lookup_key (const char *name, char **label) 
    14751476    if (name == NULL) 
    14761477        return 0; 
    14771478 
    1478     name = g_strstrip (g_strdup (name)); 
    1479     lc_keys = g_strsplit_set (name, "-+ ", -1); 
    1480     g_free ((char *) name); 
     1479    cname = g_strstrip (g_strdup (name)); 
     1480    lc_keys = g_strsplit_set (cname, "-+ ", -1); 
     1481    g_free (cname); 
    14811482 
    14821483    for (p = lc_keys; p != NULL && *p != NULL; p++) 
    14831484    {