StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

feat(core): Add error parsing for Tox_Err_Options_New

Browse Source
This commit is contained in:
Anthony Bilinski 2022-03-18 00:45:54 -07:00
parent a5660fb6e3
commit 2a2b079992
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/toxoptions.cpp
View File

@ -21,6 +21,7 @@
#include "src/core/icoresettings.h"
#include "src/core/toxlogger.h"
#include "util/toxcoreerrorparser.h"
#include <tox/tox.h>
@ -69,9 +70,10 @@ ToxOptions::operator Tox_Options*()
std::unique_ptr<ToxOptions> ToxOptions::makeToxOptions(const QByteArray& savedata,
const ICoreSettings& s)
{
Tox_Options* tox_opts = tox_options_new(nullptr);
Tox_Err_Options_New err;
Tox_Options* tox_opts = tox_options_new(&err);
if (!tox_opts) {
if (!PARSE_ERR(err) || !tox_opts) {
qWarning() << "Failed to create Tox_Options";
return {};
}

1
util/include/util/toxcoreerrorparser.h
View File

@ -58,4 +58,5 @@ namespace ToxcoreErrorParser {
bool parseErr(Toxav_Err_Bit_Rate_Set error, int line);
bool parseErr(Toxav_Err_Call_Control error, int line);
bool parseErr(Toxav_Err_Call error, int line);
bool parseErr(Tox_Err_Options_New error, int line);
} // namespace ToxcoreErrorParser

14
util/src/toxcoreerrorparser.cpp
View File

@ -629,3 +629,17 @@ bool ToxcoreErrorParser::parseErr(Toxav_Err_Call error, int line)
qCritical() << line << "Unknown Toxav_Err_Call error code:" << error;
return false;
}
bool ToxcoreErrorParser::parseErr(Tox_Err_Options_New error, int line)
{
switch (error) {
case TOX_ERR_OPTIONS_NEW_OK:
return true;
case TOX_ERR_OPTIONS_NEW_MALLOC:
qCritical() << line << ": Failed to allocate memory.";
return false;
}
qCritical() << line << "Unknown Tox_Err_Options_New error code:" << error;
return false;
}