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
|
|
49 | 49 | static void |
50 | 50 | mc_skin_get_list_from_dir (const gchar * base_dir, GPtrArray * list) |
51 | 51 | { |
52 | | gchar *name; |
| 52 | const gchar *cname; |
53 | 53 | GDir *dir; |
54 | 54 | |
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); |
56 | 56 | dir = g_dir_open (name, 0, NULL); |
57 | 57 | g_free (name); |
58 | 58 | |
59 | 59 | if (dir != NULL) |
60 | 60 | { |
61 | | while ((name = (gchar *) g_dir_read_name (dir)) != NULL) |
| 61 | while ((cname = g_dir_read_name (dir)) != NULL) |
62 | 62 | { |
63 | 63 | gchar *sname; |
64 | 64 | size_t slen; |
65 | 65 | unsigned int i; |
66 | 66 | |
67 | | slen = strlen (name); |
68 | | sname = g_strndup (name, slen); |
| 67 | slen = strlen (cname); |
| 68 | sname = g_strndup (cname, slen); |
69 | 69 | |
70 | 70 | if (slen > 4 && strcmp (sname + slen - 4, ".ini") == 0) |
71 | 71 | sname[slen - 4] = '\0'; |
… |
… |
mc_skin_get_list_from_dir (const gchar * base_dir, GPtrArray * list) |
89 | 89 | static int |
90 | 90 | string_array_comparator (gconstpointer a, gconstpointer b) |
91 | 91 | { |
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); |
96 | 93 | } |
97 | 94 | |
98 | 95 | /* --------------------------------------------------------------------------------------------- */ |