zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 04:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed one error and several warnings with GLIB 2.0

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2663 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-04-10 02:53:06 +00:00 • committed by cras
commit bd00ff54c2
7 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/core/servers.c
View file

@ -257,6 +257,8 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
/* initializes server record but doesn't start connecting */
void server_connect_init(SERVER_REC *server)
{
const char *str;
g_return_if_fail(server != NULL);
MODULE_DATA_INIT(server);
@ -267,16 +269,16 @@ void server_connect_init(SERVER_REC *server)
if (server->connrec->username == NULL || *server->connrec->username == '\0') {
g_free_not_null(server->connrec->username);
server->connrec->username = g_get_user_name();
if (*server->connrec->username == '\0') server->connrec->username = "-";
server->connrec->username = g_strdup(server->connrec->username);
str = g_get_user_name();
if (*str == '\0') str = "-";
server->connrec->username = g_strdup(str);
}
if (server->connrec->realname == NULL || *server->connrec->realname == '\0') {
g_free_not_null(server->connrec->realname);
server->connrec->realname = g_get_real_name();
if (*server->connrec->realname == '\0') server->connrec->realname = "-";
server->connrec->realname = g_strdup(server->connrec->realname);
str = g_get_real_name();
if (*str == '\0') str = "-";
server->connrec->realname = g_strdup(str);
}
server->tag = server_create_tag(server->connrec);

7
src/core/session.c
View file

@ -39,6 +39,7 @@ static char **session_args;
void session_set_binary(const char *path)
{
const char *envpath;
char **paths, **tmp;
char *str;
@ -59,10 +60,10 @@ void session_set_binary(const char *path)
}
/* we'll need to find it from path. */
str = g_getenv("PATH");
if (str == NULL) return;
envpath = g_getenv("PATH");
if (envpath == NULL) return;
paths = g_strsplit(str, ":", -1);
paths = g_strsplit(envpath, ":", -1);
for (tmp = paths; *tmp != NULL; tmp++) {
str = g_strconcat(*tmp, G_DIR_SEPARATOR_S, path, NULL);
if (access(str, X_OK) == 0) {

4
src/core/special-vars.c
View file

@ -106,7 +106,7 @@ static char *get_long_variable_value(const char *key, SERVER_REC *server,
void *item, int *free_ret)
{
EXPANDO_FUNC func;
char *ret;
const char *ret;
int type;
*free_ret = FALSE;
@ -124,7 +124,7 @@ static char *get_long_variable_value(const char *key, SERVER_REC *server,
/* environment variable? */
ret = g_getenv(key);
if (ret != NULL)
return ret;
return (char *) ret;
return NULL;
}