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) |
289 | 289 | char *dir; |
290 | 290 | #if MC_HOMEDIR_XDG == 0 |
291 | 291 | char *defined_userconf_dir; |
| 292 | #else |
| 293 | const char *cdir; |
292 | 294 | #endif |
293 | 295 | |
294 | 296 | mc_return_if_error (mcerror); |
… |
… |
mc_config_init_config_paths (GError ** mcerror) |
316 | 318 | } |
317 | 319 | else |
318 | 320 | { |
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); |
322 | 324 | else |
323 | 325 | { |
324 | 326 | dir = g_build_filename (homedir, ".config", (char *) NULL); |
… |
… |
mc_config_init_config_paths (GError ** mcerror) |
326 | 328 | g_free (dir); |
327 | 329 | } |
328 | 330 | |
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); |
332 | 334 | else |
333 | 335 | { |
334 | 336 | dir = g_build_filename (homedir, ".cache", (char *) NULL); |
… |
… |
mc_config_init_config_paths (GError ** mcerror) |
336 | 338 | g_free (dir); |
337 | 339 | } |
338 | 340 | |
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); |
342 | 344 | else |
343 | 345 | { |
344 | 346 | dir = g_build_filename (homedir, ".local", "share", (char *) NULL); |