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 /modules/hostserv | |
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 'modules/hostserv')
-rw-r--r-- | modules/hostserv/hs_list.cpp | 13 | ||||
-rw-r--r-- | modules/hostserv/hs_request.cpp | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/modules/hostserv/hs_list.cpp b/modules/hostserv/hs_list.cpp index 7b85bead3..dd459fd78 100644 --- a/modules/hostserv/hs_list.cpp +++ b/modules/hostserv/hs_list.cpp @@ -45,12 +45,9 @@ public: source.Reply(LIST_INCORRECT_RANGE); return; } - try - { - from = convertTo<int>(key.substr(1, tmp - 1)); - to = convertTo<int>(key.substr(tmp + 1)); - } - catch (const ConvertException &) { } + + from = Anope::Convert<int>(key.substr(1, tmp - 1), 0); + to = Anope::Convert<int>(key.substr(tmp + 1), 0); } } @@ -70,7 +67,7 @@ public: ++display_counter; ListFormatter::ListEntry entry; - entry["Number"] = stringify(display_counter); + entry["Number"] = Anope::ToString(display_counter); entry["Nick"] = na->nick; entry["Vhost"] = na->GetVhostMask(); entry["Creator"] = na->GetVhostCreator(); @@ -88,7 +85,7 @@ public: { ++display_counter; ListFormatter::ListEntry entry; - entry["Number"] = stringify(display_counter); + entry["Number"] = Anope::ToString(display_counter); entry["Nick"] = na->nick; entry["Vhost"] = na->GetVhostMask(); entry["Creator"] = na->GetVhostCreator(); diff --git a/modules/hostserv/hs_request.cpp b/modules/hostserv/hs_request.cpp index 021e5f5b7..d7bc6bc34 100644 --- a/modules/hostserv/hs_request.cpp +++ b/modules/hostserv/hs_request.cpp @@ -320,7 +320,7 @@ public: ++display_counter; ListFormatter::ListEntry entry; - entry["Number"] = stringify(display_counter); + entry["Number"] = Anope::ToString(display_counter); entry["Nick"] = nick; if (!hr->ident.empty()) entry["Vhost"] = hr->ident + "@" + hr->host; |