1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-05 09:13:14 +02:00

irc: use util functions to parse integers

This commit is contained in:
Sébastien Helleu
2026-06-20 11:09:20 +02:00
parent 9b418b4dc2
commit b49eac6f2d
11 changed files with 93 additions and 185 deletions
+7 -17
View File
@@ -676,10 +676,9 @@ int
irc_server_set_addresses (struct t_irc_server *server, const char *addresses,
int tls)
{
int rc, i, default_port;
char *pos, *error, *addresses_eval;
int rc, i, default_port, number;
char *pos, *addresses_eval;
const char *ptr_addresses;
long number;
if (!server)
return 0;
@@ -753,19 +752,14 @@ irc_server_set_addresses (struct t_irc_server *server, const char *addresses,
server->addresses_count * sizeof (server->retry_array[0]));
for (i = 0; i < server->addresses_count; i++)
{
server->ports_array[i] = default_port;
pos = strchr (server->addresses_array[i], '/');
if (pos)
{
pos[0] = 0;
pos++;
error = NULL;
number = strtol (pos, &error, 10);
server->ports_array[i] = (error && !error[0]) ?
number : default_port;
}
else
{
server->ports_array[i] = default_port;
if (weechat_util_parse_int (pos, 10, &number))
server->ports_array[i] = number;
}
server->retry_array[i] = 0;
}
@@ -1518,18 +1512,14 @@ int
irc_server_get_max_modes (struct t_irc_server *server)
{
const char *support_modes;
char *error;
long number;
int max_modes;
int max_modes, number;
max_modes = 4;
support_modes = irc_server_get_isupport_value (server, "MODES");
if (support_modes)
{
error = NULL;
number = strtol (support_modes, &error, 10);
if (error && !error[0])
if (weechat_util_parse_int (support_modes, 10, &number))
{
max_modes = number;
if (max_modes < 1)