diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ab796b..abf58cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(redox) set(REDOX_VERSION_MAJOR 0) set(REDOX_VERSION_MINOR 2) -set(REDOX_VERSION_PATCH 2) +set(REDOX_VERSION_PATCH 3) set(REDOX_VERSION_STRING ${REDOX_VERSION_MAJOR}.${REDOX_VERSION_MINOR}.${REDOX_VERSION_PATCH}) option(lib "Build Redox as a dynamic library." ON) @@ -154,12 +154,12 @@ endif() set(CMAKE_INSTALL_PREFIX /usr/) -MESSAGE ("CMAKE_SIZEOF_VOID_P: ${CMAKE_SIZEOF_VOID_P}") +# Check if it is a 64 bit system if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT LIB_SUFFIX) set(LIB_SUFFIX "64") endif() -# Install the dynamic library to /usr/lib(64) +# Install the dynamic library to /usr/lib[64] install(TARGETS redox DESTINATION lib${LIB_SUFFIX}) # Install the headers into /usr/include/redox diff --git a/README.md b/README.md index 5e31b5c..33c7851 100644 --- a/README.md +++ b/README.md @@ -301,9 +301,11 @@ the following commands: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. make package +NOTE: To build RPM packages, you will need rpmbuild. + ## Contributing Redox is in its early stages and I am looking for feedback and contributors to make it easier, faster, and more robust. Open issues on GitHub or message me directly. -Redox is not currently recommended for production use. It has no support for features like -connection pooling, sentinels, clusters, etc. Feel free to provide them! +Redox is not currently recommended for production use. It has no support yet for sentinels +or clusters. Feel free to provide them! diff --git a/src/command.cpp b/src/command.cpp index 9302c05..3baeb60 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -167,8 +167,7 @@ template bool Command::checkErrorReply() { if (reply_obj_->type == REDIS_REPLY_ERROR) { - if (0 != reply_obj_->str) - { + if (reply_obj_->str != 0) { last_error_ = reply_obj_->str; } diff --git a/test/test.cpp b/test/test.cpp index f422a51..bfd168f 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -49,9 +49,7 @@ protected: rdx.command({"DEL", "redox_test:a"}); } - virtual ~RedoxTest() - { - } + virtual ~RedoxTest() {} // CV and counter to wait for async commands to complete atomic_int cmd_count = {0}; @@ -153,13 +151,11 @@ protected: // Core unit tests - asynchronous // ------------------------------------------- -TEST_F(RedoxTest, TestConnection) -{ +TEST_F(RedoxTest, TestConnection) { EXPECT_TRUE(rdx.connect("localhost", 6379)); } -TEST_F(RedoxTest, TestConnectionFailure) -{ +TEST_F(RedoxTest, TestConnectionFailure) { EXPECT_FALSE(rdx.connect("localhost", 6380)); }