ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up some use of Error for throw

Browse Source
This commit is contained in:
Vinnie Falco
2013-09-28 18:15:00 -07:00
parent e5e0f527fe
commit 4394594518
13 changed files with 34 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/beast_sqdb/source/session.cpp
View File

@@ -67,14 +67,12 @@ public:
{
int threadSafe = sqlite3_threadsafe();
if (threadSafe == 0)
Throw(Error().fail(__FILE__, __LINE__, Error::assertFailed));
check_precondition (threadSafe != 0);
#if 0
int result = sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
if (result != SQLITE_OK)
Throw(Error().fail(__FILE__, __LINE__, Error::assertFailed));
check_postcondition (result == SQLITE_OK);
#endif
sqlite3_initialize();
@@ -115,8 +113,7 @@ session::~session()
Error session::clone()
{
if (m_connection)
Throw(Error().fail(__FILE__, __LINE__)); // already open
check_precondition (! m_connection);
return open(m_fileName, m_connectString);
}
@@ -134,8 +131,7 @@ Error session::open(String fileName, std::string options)
Error err;
// can't open twice
if (m_connection)
Throw(err.fail(__FILE__, __LINE__, Error::fileInUse));
check_precondition (! m_connection);
int mode = 0;
int flags = 0;
@@ -183,13 +179,12 @@ Error session::open(String fileName, std::string options)
}
else
{
Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
fatal_error ("bad parameter");
}
}
else
{
// duplicate
Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
fatal_error ("duplicate parameter");
}
}
@@ -210,13 +205,12 @@ Error session::open(String fileName, std::string options)
}
else
{
Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
fatal_error ("bad parameter");
}
}
else
{
// duplicate
Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
fatal_error ("duplicate parameter");
}
}
@@ -235,19 +229,17 @@ Error session::open(String fileName, std::string options)
}
else
{
Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
fatal_error ("bad parameter");
}
}
else
{
// duplicate
Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
fatal_error ("duplicate parameter");
}
}
else
{
// unknown option
Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
fatal_error ("unknown parameter");
}
}