Ticket #3598: mc-3598-0004-paths.c-cleanup-Wcast-qual-warning.patch

File mc-3598-0004-paths.c-cleanup-Wcast-qual-warning.patch, 2.8 KB (added by and, 8 years ago)

  • lib/mcconfig/paths.c 

    From d4b6a11e0136227ce02e5fedde043945a96ddcec Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Wed, 24 Feb 2016 16:15:07 +0000
Subject: [PATCH] paths.c: cleanup -Wcast-qual warning

paths.c:319:15: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
         dir = (char *) g_get_user_config_dir ();
               ^
paths.c:329:15: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
         dir = (char *) g_get_user_cache_dir ();
               ^
paths.c:339:15: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
         dir = (char *) g_get_user_data_dir ();
               ^

Signed-off-by: Andreas Mohr <and@gmx.li>
---
 lib/mcconfig/paths.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/mcconfig/paths.c b/lib/mcconfig/paths.c
index bfcf3f4..43adcbf 100644
    a b mc_config_init_config_paths (GError ** mcerror) 
    289289    char *dir; 
    290290#if MC_HOMEDIR_XDG == 0 
    291291    char *defined_userconf_dir; 
     292#else 
     293    const char *cdir; 
    292294#endif 
    293295 
    294296    mc_return_if_error (mcerror); 
    … … mc_config_init_config_paths (GError ** mcerror) 
    316318    } 
    317319    else 
    318320    { 
    319         dir = (char *) g_get_user_config_dir (); 
    320         if (dir != NULL && *dir != '\0') 
    321             mc_config_str = mc_config_init_one_config_path (dir, MC_USERCONF_DIR, mcerror); 
     321        cdir = g_get_user_config_dir (); 
     322        if (cdir != NULL && *cdir != '\0') 
     323            mc_config_str = mc_config_init_one_config_path (cdir, MC_USERCONF_DIR, mcerror); 
    322324        else 
    323325        { 
    324326            dir = g_build_filename (homedir, ".config", (char *) NULL); 
    … … mc_config_init_config_paths (GError ** mcerror) 
    326328            g_free (dir); 
    327329        } 
    328330 
    329         dir = (char *) g_get_user_cache_dir (); 
    330         if (dir != NULL && *dir != '\0') 
    331             mc_cache_str = mc_config_init_one_config_path (dir, MC_USERCONF_DIR, mcerror); 
     331        cdir = g_get_user_cache_dir (); 
     332        if (cdir != NULL && *cdir != '\0') 
     333            mc_cache_str = mc_config_init_one_config_path (cdir, MC_USERCONF_DIR, mcerror); 
    332334        else 
    333335        { 
    334336            dir = g_build_filename (homedir, ".cache", (char *) NULL); 
    … … mc_config_init_config_paths (GError ** mcerror) 
    336338            g_free (dir); 
    337339        } 
    338340 
    339         dir = (char *) g_get_user_data_dir (); 
    340         if (dir != NULL && *dir != '\0') 
    341             mc_data_str = mc_config_init_one_config_path (dir, MC_USERCONF_DIR, mcerror); 
     341        cdir = g_get_user_data_dir (); 
     342        if (cdir != NULL && *cdir != '\0') 
     343            mc_data_str = mc_config_init_one_config_path (cdir, MC_USERCONF_DIR, mcerror); 
    342344        else 
    343345        { 
    344346            dir = g_build_filename (homedir, ".local", "share", (char *) NULL);