iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix incorrect const usage

Browse Source
This commit is contained in:
Patrick Griffis 2015-11-09 14:51:48 -05:00
parent 0bd15d435a
commit 295061f461
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/cfgfiles.c
View File

@ -585,16 +585,17 @@ const struct prefs vars[] =
{0, 0, 0}, {0, 0, 0},
}; };
static const char *
convert_with_fallback (const char *str, const char *fallback) static char *
convert_with_fallback (char *str, const char *fallback)
{ {
const char *utf; char *utf;
#ifndef WIN32 #ifndef WIN32
/* On non-Windows, g_get_user_name and g_get_real_name return a string in system locale, so convert it to utf-8. */ /* On non-Windows, g_get_user_name and g_get_real_name return a string in system locale, so convert it to utf-8. */
utf = g_locale_to_utf8 (str, -1, NULL, NULL, 0); utf = g_locale_to_utf8 (str, -1, NULL, NULL, 0);
g_free ((char*)str); g_free (str);
/* The returned string is NULL if conversion from locale to utf-8 failed for any reason. Return the fallback. */ /* The returned string is NULL if conversion from locale to utf-8 failed for any reason. Return the fallback. */
if (!utf) if (!utf)
@ -711,7 +712,8 @@ get_default_spell_languages (void)
void void
load_default_config(void) load_default_config(void)
{ {
const char *username, *realname, *font, *langs; char *username, *realname, *langs;
const char *font;
char *sp; char *sp;
#ifdef WIN32 #ifdef WIN32
wchar_t* roaming_path_wide; wchar_t* roaming_path_wide;
@ -904,9 +906,9 @@ load_default_config(void)
if (sp) if (sp)
sp[0] = 0; /* spaces in username would break the login */ sp[0] = 0; /* spaces in username would break the login */
g_free ((char *)username); g_free (username);
g_free ((char *)realname); g_free (realname);
g_free ((char *)langs); g_free (langs);
} }
int int