Ticket #3598: mc-3598-0007-skin-ini-file.c-cleanup-Wcast-qual-warning.patch

File mc-3598-0007-skin-ini-file.c-cleanup-Wcast-qual-warning.patch, 2.2 KB (added by and, 8 years ago)

  • lib/skin/ini-file.c 

    From 172d729569e729669a8b254dd1b1406dce9af318 Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Sat, 20 Feb 2016 14:52:31 +0000
Subject: [PATCH] skin/ini-file.c: cleanup -Wcast-qual warning

ini-file.c:61:24: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
         while ((name = (gchar *) g_dir_read_name (dir)) != NULL)
                        ^
ini-file.c:92:17: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     char *aa = *(char **) a;
                 ^
ini-file.c:93:17: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     char *bb = *(char **) b;
                 ^

Signed-off-by: Andreas Mohr <and@gmx.li>

---
 lib/skin/ini-file.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/skin/ini-file.c b/lib/skin/ini-file.c
index 32c3a99..22bc8b0 100644
    a b  
    4949static void 
    5050mc_skin_get_list_from_dir (const gchar * base_dir, GPtrArray * list) 
    5151{ 
    52     gchar *name; 
     52    const gchar *cname; 
    5353    GDir *dir; 
    5454 
    55     name = g_build_filename (base_dir, MC_SKINS_SUBDIR, (char *) NULL); 
     55    gchar *name = g_build_filename (base_dir, MC_SKINS_SUBDIR, (char *) NULL); 
    5656    dir = g_dir_open (name, 0, NULL); 
    5757    g_free (name); 
    5858 
    5959    if (dir != NULL) 
    6060    { 
    61         while ((name = (gchar *) g_dir_read_name (dir)) != NULL) 
     61        while ((cname = g_dir_read_name (dir)) != NULL) 
    6262        { 
    6363            gchar *sname; 
    6464            size_t slen; 
    6565            unsigned int i; 
    6666 
    67             slen = strlen (name); 
    68             sname = g_strndup (name, slen); 
     67            slen = strlen (cname); 
     68            sname = g_strndup (cname, slen); 
    6969 
    7070            if (slen > 4 && strcmp (sname + slen - 4, ".ini") == 0) 
    7171                sname[slen - 4] = '\0'; 
    … … mc_skin_get_list_from_dir (const gchar * base_dir, GPtrArray * list) 
    8989static int 
    9090string_array_comparator (gconstpointer a, gconstpointer b) 
    9191{ 
    92     char *aa = *(char **) a; 
    93     char *bb = *(char **) b; 
    94  
    95     return strcmp (aa, bb); 
     92    return strcmp (*(char *const *) a, *(char *const *) b); 
    9693} 
    9794 
    9895/* --------------------------------------------------------------------------------------------- */