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/extra | |
| 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/extra')
| -rw-r--r-- | modules/extra/mysql.cpp | 4 | ||||
| -rw-r--r-- | modules/extra/regex_pcre2.cpp | 2 | ||||
| -rw-r--r-- | modules/extra/sqlite.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/extra/mysql.cpp b/modules/extra/mysql.cpp index 49149464f..72c026dad 100644 --- a/modules/extra/mysql.cpp +++ b/modules/extra/mysql.cpp @@ -452,7 +452,7 @@ Query MySQLService::BuildInsert(const Anope::string &table, unsigned int id, Dat for (const auto &[field, _] : data.data) query_text += ",`" + field + "`"; - query_text += ") VALUES (" + stringify(id); + query_text += ") VALUES (" + Anope::ToString(id); for (const auto &[field, _] : data.data) query_text += ",@" + field + "@"; query_text += ") ON DUPLICATE KEY UPDATE "; @@ -536,7 +536,7 @@ Anope::string MySQLService::BuildQuery(const Query &q) Anope::string MySQLService::FromUnixtime(time_t t) { - return "FROM_UNIXTIME(" + stringify(t) + ")"; + return "FROM_UNIXTIME(" + Anope::ToString(t) + ")"; } void DispatcherThread::Run() diff --git a/modules/extra/regex_pcre2.cpp b/modules/extra/regex_pcre2.cpp index ef2786823..991be3f6c 100644 --- a/modules/extra/regex_pcre2.cpp +++ b/modules/extra/regex_pcre2.cpp @@ -30,7 +30,7 @@ public: { PCRE2_UCHAR error[128]; pcre2_get_error_message(errcode, error, sizeof error); - throw RegexException("Error in regex " + expr + " at offset " + stringify(erroffset) + ": " + reinterpret_cast<const char*>(error)); + throw RegexException("Error in regex " + expr + " at offset " + Anope::ToString(erroffset) + ": " + reinterpret_cast<const char*>(error)); } } diff --git a/modules/extra/sqlite.cpp b/modules/extra/sqlite.cpp index b481093ca..4968e8e0d 100644 --- a/modules/extra/sqlite.cpp +++ b/modules/extra/sqlite.cpp @@ -297,7 +297,7 @@ Query SQLiteService::BuildInsert(const Anope::string &table, unsigned int id, Da query_text.erase(query_text.length() - 1); query_text += ") VALUES ("; if (id > 0) - query_text += stringify(id) + ","; + query_text += Anope::ToString(id) + ","; for (const auto &[field, _] : data.data) query_text += "@" + field + "@,"; query_text.erase(query_text.length() - 1); @@ -339,7 +339,7 @@ Anope::string SQLiteService::BuildQuery(const Query &q) Anope::string SQLiteService::FromUnixtime(time_t t) { - return "datetime('" + stringify(t) + "', 'unixepoch')"; + return "datetime('" + Anope::ToString(t) + "', 'unixepoch')"; } MODULE_INIT(ModuleSQLite) |