diff options
| -rw-r--r-- | src/core/servers.c | 14 | ||||
| -rw-r--r-- | src/core/session.c | 7 | ||||
| -rw-r--r-- | src/core/special-vars.c | 4 | ||||
| -rw-r--r-- | src/fe-common/core/completion.c | 3 | ||||
| -rw-r--r-- | src/fe-common/core/keyboard.c | 5 | ||||
| -rw-r--r-- | src/irc/core/irc-servers-setup.c | 3 | ||||
| -rw-r--r-- | src/irc/dcc/dcc-send.c | 3 |
7 files changed, 23 insertions, 16 deletions
diff --git a/src/core/servers.c b/src/core/servers.c index f99b238f..1e5c0b84 100644 --- a/src/core/servers.c +++ b/src/core/servers.c @@ -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); diff --git a/src/core/session.c b/src/core/session.c index 7e7b0afa..b5419134 100644 --- a/src/core/session.c +++ b/src/core/session.c @@ -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) { diff --git a/src/core/special-vars.c b/src/core/special-vars.c index 2556cd63..7291f469 100644 --- a/src/core/special-vars.c +++ b/src/core/special-vars.c @@ -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; } diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c index f10fbb6d..33287b73 100644 --- a/src/fe-common/core/completion.c +++ b/src/fe-common/core/completion.c @@ -267,7 +267,8 @@ GList *filename_complete(const char *path, const char *default_path) GList *list; DIR *dirp; struct dirent *dp; - char *realpath, *dir, *basename, *name; + const char *basename; + char *realpath, *dir, *name; int len; g_return_val_if_fail(path != NULL, NULL); diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c index 3c0efade..f6cffecb 100644 --- a/src/fe-common/core/keyboard.c +++ b/src/fe-common/core/keyboard.c @@ -563,8 +563,11 @@ int key_pressed(KEYBOARD_REC *keyboard, const char *key) g_strconcat(keyboard->key_state, "-", key, NULL); g_free_and_null(keyboard->key_state); +#if GLIB_MAJOR_VERSION == 2 +# define GSearchFunc GCompareFunc +#endif rec = g_tree_search(key_states, - (GSearchFunc) key_states_search, + (GCompareFunc) key_states_search, combo); if (rec == NULL) { /* unknown key combo, eat the invalid key diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c index bbc710f4..5b4fcb44 100644 --- a/src/irc/core/irc-servers-setup.c +++ b/src/irc/core/irc-servers-setup.c @@ -83,8 +83,7 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn, static void init_userinfo(void) { - const char *set, *nick, *user_name; - char *str; + const char *set, *nick, *user_name, *str; /* check if nick/username/realname wasn't read from setup.. */ set = settings_get_str("real_name"); diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c index 7c35cc4d..14b67285 100644 --- a/src/irc/dcc/dcc-send.c +++ b/src/irc/dcc/dcc-send.c @@ -168,7 +168,8 @@ static char *dcc_send_get_file(const char *fname) static void cmd_dcc_send(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item) { - char *target, *fname, *str; + const char *fname; + char *target, *str; void *free_arg; char host[MAX_IP_LEN]; int hfile, port; |