aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00
Code

Removed some old backwards compatibility code.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2411 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-02-10 11:04:08 +00:00 committed by cras
parent 86dadc071c
commit 9575eecb39
5 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/channels-setup.c
View File

@ -118,13 +118,6 @@ static CHANNEL_SETUP_REC *channel_setup_read(CONFIG_NODE *node)
channel = config_node_get_str(node, "name", NULL);
chatnet = config_node_get_str(node, "chatnet", NULL);
if (chatnet == NULL) /* FIXME: remove this after .98... */ {
chatnet = g_strdup(config_node_get_str(node, "ircnet", NULL));
if (chatnet != NULL) {
iconfig_node_set_str(node, "chatnet", chatnet);
iconfig_node_set_str(node, "ircnet", NULL);
}
}
chatnetrec = chatnet == NULL ? NULL : chatnet_find(chatnet);
if (channel == NULL || chatnetrec == NULL) {

11
src/core/chatnets.c
View File

@ -168,17 +168,6 @@ static void read_chatnets(void)
chatnet_destroy(chatnets->data);
node = iconfig_node_traverse("chatnets", FALSE);
if (node == NULL) {
/* FIXME: remove after .98 */
node = iconfig_node_traverse("ircnets", FALSE);
if (node != NULL) {
/* very dirty method - doesn't update hashtables
but this will do temporarily.. */
g_free(node->key);
node->key = g_strdup("chatnets");
}
}
if (node != NULL) {
tmp = config_node_first(node->value);
for (; tmp != NULL; tmp = config_node_next(tmp))

10
src/core/ignore.c
View File

@ -418,19 +418,9 @@ static void read_ignores(void)
ignores = g_slist_append(ignores, rec);
rec->mask = g_strdup(config_node_get_str(node, "mask", NULL));
if (rec->mask != NULL && strcmp(rec->mask, "*") == 0) {
/* FIXME: remove after .98 */
g_free(rec->mask);
rec->mask = NULL;
}
rec->pattern = g_strdup(config_node_get_str(node, "pattern", NULL));
rec->level = level2bits(config_node_get_str(node, "level", ""));
rec->exception = config_node_get_bool(node, "exception", FALSE);
if (*config_node_get_str(node, "except_level", "") != '\0') {
/* FIXME: remove after .98 */
rec->level = level2bits(config_node_get_str(node, "except_level", ""));
rec->exception = TRUE;
}
rec->regexp = config_node_get_bool(node, "regexp", FALSE);
rec->fullword = config_node_get_bool(node, "fullword", FALSE);
rec->replies = config_node_get_bool(node, "replies", FALSE);

4
src/core/network.c
View File

@ -414,7 +414,9 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
return count > 0 ? 0 : 1;
#else
hp = gethostbyname(addr);
if (hp == NULL) return h_errno;
if (hp == NULL)
return -1;
//return h_errno;
ip4->family = AF_INET;
memcpy(&ip4->ip, hp->h_addr, 4);

8
src/core/servers-setup.c
View File

@ -371,14 +371,6 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
rec = NULL;
chatnet = config_node_get_str(node, "chatnet", NULL);
if (chatnet == NULL) /* FIXME: remove this after .98... */ {
chatnet = config_node_get_str(node, "ircnet", NULL);
if (chatnet != NULL) {
iconfig_node_set_str(node, "chatnet", chatnet);
iconfig_node_set_str(node, "ircnet", NULL);
chatnet = config_node_get_str(node, "chatnet", NULL);
}
}
chatnetrec = chatnet == NULL ? NULL : chatnet_find(chatnet);
if (chatnetrec == NULL && chatnet != NULL) {