1
0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00

Unline glib.h tells, g_getenv() doesn't return newly allocated string

after all..


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@239 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-05-25 13:54:43 +00:00 committed by cras
parent d1a15dcfe8
commit 2440a5b0b6
2 changed files with 2 additions and 9 deletions

View File

@ -119,10 +119,8 @@ static char *get_long_variable_value(const char *key, void *server, void *item,
/* environment variable? */
ret = g_getenv(key);
if (ret != NULL) {
*free_ret = TRUE;
if (ret != NULL)
return ret;
}
return NULL;
}

View File

@ -205,7 +205,6 @@ static void init_userinfo(void)
str = g_getenv("IRCNAME");
iconfig_set_str("settings", "real_name",
str != NULL ? str : g_get_real_name());
g_free_not_null(str);
}
/* username */
@ -214,7 +213,6 @@ static void init_userinfo(void)
str = g_getenv("IRCUSER");
iconfig_set_str("settings", "user_name",
str != NULL ? str : g_get_user_name());
g_free_not_null(str);
user_name = settings_get_str("user_name");
}
@ -225,7 +223,6 @@ static void init_userinfo(void)
str = g_getenv("IRCNICK");
iconfig_set_str("settings", "default_nick",
str != NULL ? str : user_name);
g_free_not_null(str);
default_nick = settings_get_str("default_nick");
}
@ -247,10 +244,8 @@ static void init_userinfo(void)
set = settings_get_str("hostname");
if (set == NULL || *set == '\0') {
str = g_getenv("IRCHOST");
if (str != NULL) {
if (str != NULL)
iconfig_set_str("settings", "hostname", str);
g_free(str);
}
}
}