diff options
author | Sadie Powell <sadie@witchery.services> | 2024-03-11 13:53:05 +0000 |
---|---|---|
committer | Sadie Powell <sadie@witchery.services> | 2024-03-11 19:17:29 +0000 |
commit | 29e7674e56bf2b829bba22def2760d034a76e788 (patch) | |
tree | f40049ba995b03dd7c510d88f9f19db2d2e65a2e /src/sockets.cpp | |
parent | e2df7d4d01f8fdb41c49ce8efc462cab005e7d5c (diff) |
Replace convertTo/stringify with non-throwing alternatives.
Having these throw is terrible for ergonomics and there are loads
of places where the exception was either silently ignored or not
handled at all. Having a function which returns an optional and
another that returns a default works a lot better imo.
Diffstat (limited to 'src/sockets.cpp')
-rw-r--r-- | src/sockets.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/sockets.cpp b/src/sockets.cpp index fc2940a59..6d6718547 100644 --- a/src/sockets.cpp +++ b/src/sockets.cpp @@ -282,13 +282,7 @@ cidr::cidr(const Anope::string &ip) Anope::string cidr_range = ip.substr(sl + 1); this->cidr_ip = real_ip; - this->cidr_len = ipv6 ? 128 : 32; - try - { - if (cidr_range.is_pos_number_only()) - this->cidr_len = convertTo<unsigned int>(cidr_range); - } - catch (const ConvertException &) { } + this->cidr_len = Anope::Convert<unsigned int>(cidr_range, ipv6 ? 128 : 32); this->addr.pton(ipv6 ? AF_INET6 : AF_INET, real_ip); } } |