From c0b60e274e92fe118a3953cc61909047842c197a Mon Sep 17 00:00:00 2001 From: Andreas Mohr Date: Sat, 20 Feb 2016 14:52:31 +0000 Subject: [PATCH] lib/skin/ini-file.c: cleanup -Wcast-qual warning. Signed-off-by: Andreas Mohr Signed-off-by: Andrew Borodin --- lib/skin/ini-file.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/skin/ini-file.c b/lib/skin/ini-file.c index 32c3a998d..76bf7a1d8 100644 --- a/lib/skin/ini-file.c +++ b/lib/skin/ini-file.c @@ -58,14 +58,16 @@ mc_skin_get_list_from_dir (const gchar * base_dir, GPtrArray * list) if (dir != NULL) { - while ((name = (gchar *) g_dir_read_name (dir)) != NULL) + const gchar *cname; + + while ((cname = g_dir_read_name (dir)) != NULL) { gchar *sname; size_t slen; unsigned int i; - slen = strlen (name); - sname = g_strndup (name, slen); + slen = strlen (cname); + sname = g_strndup (cname, slen); if (slen > 4 && strcmp (sname + slen - 4, ".ini") == 0) sname[slen - 4] = '\0'; @@ -89,10 +91,7 @@ mc_skin_get_list_from_dir (const gchar * base_dir, GPtrArray * list) static int string_array_comparator (gconstpointer a, gconstpointer b) { - char *aa = *(char **) a; - char *bb = *(char **) b; - - return strcmp (aa, bb); + return strcmp (*(char *const *) a, *(char *const *) b); } /* --------------------------------------------------------------------------------------------- */ -- 2.11.4.GIT