Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some warnings and increase safety checking on gcc #119

Merged
merged 4 commits into from
Mar 31, 2017
Merged

Fix some warnings and increase safety checking on gcc #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c33903
Remove const from Database::isUnencrypted() return type
timrae Mar 31, 2017
b23f2e1
Use -Wextra flag with gcc
timrae Mar 31, 2017
400ab71
Fix unused parameter warning
timrae Mar 31, 2017
2123ef0
Use pedantic warnings
timrae Mar 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ else (MSVC)
set(CPPLINT_ARG_OUTPUT "--output=eclipse")
set(CPPCHECK_ARG_TEMPLATE "--template=gcc")
# Useful compile flags and extra warnings
add_compile_options(-fstack-protector -Wall -Winit-self -Wswitch-enum -Wshadow -Winline)
add_compile_options(-fstack-protector -Wall -Wextra -Wpedantic -Wno-long-long -Wswitch-enum -Wshadow -Winline)
if (CMAKE_COMPILER_IS_GNUCXX)
# GCC flags
if (SQLITECPP_USE_GCOV AND CMAKE_COMPILER_IS_GNUCXX)
Expand Down
2 changes: 1 addition & 1 deletion include/SQLiteCpp/Database.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ class Database
*
* @throw SQLite::Exception in case of error
*/
static const bool isUnencrypted(const std::string& aFilename);
static bool isUnencrypted(const std::string& aFilename);

private:
/// @{ Database must be non-copyable
Expand Down
3 changes: 2 additions & 1 deletion src/Database.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,13 +259,14 @@ void Database::rekey(const std::string& aNewKey) const
check(ret);
}
#else // SQLITE_HAS_CODEC
static_cast<void>(aNewKey); // silence unused parameter warning
const SQLite::Exception exception("No encryption support, recompile with SQLITE_HAS_CODEC to enable.");
throw exception;
#endif // SQLITE_HAS_CODEC
}

// Test if a file contains an unencrypted database.
const bool Database::isUnencrypted(const std::string& aFilename)
bool Database::isUnencrypted(const std::string& aFilename)
{
if (aFilename.length() > 0) {
std::ifstream fileBuffer(aFilename.c_str(), std::ios::in | std::ios::binary);
Expand Down