zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-19 16:42:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Simplify the code

Browse source 
Early exit, simpler code.
This commit is contained in:
LemonBoy 2017-10-24 15:47:06 +02:00
commit c00132ac4c
1 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/irc/core/irc-cap.c
View file

@ -155,18 +155,16 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
for (i = 0; i < caps_length; i++) { for (i = 0; i < caps_length; i++) {
char *key, *val; char *key, *val;
if (parse_cap_name(caps[i], &key, &val)) { if (!parse_cap_name(caps[i], &key, &val)) {
if (!g_hash_table_insert(server->cap_supported,
key, val)) {
/* The specification doesn't say anything about
* duplicated values, let's just warn the user */
g_warning("Duplicate value %s", key);
}
}
else {
g_warning("Invalid CAP %s key/value pair", evt); g_warning("Invalid CAP %s key/value pair", evt);
continue; continue;
} }
if (!g_hash_table_insert(server->cap_supported, key, val)) {
/* The specification doesn't say anything about
* duplicated values, let's just warn the user */
g_warning("Duplicate value %s", key);
}
} }
/* A multiline response is always terminated by a normal one, /* A multiline response is always terminated by a normal one,
@ -242,14 +240,12 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
for (i = 0; i < caps_length; i++) { for (i = 0; i < caps_length; i++) {
char *key, *val; char *key, *val;
if (parse_cap_name(caps[i], &key, &val)) { if (!parse_cap_name(caps[i], &key, &val)) {
g_hash_table_insert(server->cap_supported,
key, val);
}
else {
g_warning("Invalid CAP %s key/value pair", evt); g_warning("Invalid CAP %s key/value pair", evt);
continue; continue;
} }
g_hash_table_insert(server->cap_supported, key, val);
cap_emit_signal(server, "new", key); cap_emit_signal(server, "new", key);
} }
} }
@ -257,13 +253,12 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
for (i = 0; i < caps_length; i++) { for (i = 0; i < caps_length; i++) {
char *key, *val; char *key, *val;
if (parse_cap_name(caps[i], &key, &val)) { if (!parse_cap_name(caps[i], &key, &val)) {
g_hash_table_remove(server->cap_supported, key);
}
else {
g_warning("Invalid CAP %s key/value pair", evt); g_warning("Invalid CAP %s key/value pair", evt);
continue; continue;
} }
g_hash_table_remove(server->cap_supported, key);
cap_emit_signal(server, "delete", key); cap_emit_signal(server, "delete", key);
/* The server removed this CAP, remove it from the list /* The server removed this CAP, remove it from the list
* of the active ones if we had requested it */ * of the active ones if we had requested it */