Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
scottashton 2014-03-27 11:06:47 +01:00
parent fd2253076e 8f81f3f8f6
commit 22400966b2
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Wal/Logfile.h
View File

@ -231,8 +231,6 @@ namespace triagens {
static std::string statusText (StatusType status) { static std::string statusText (StatusType status) {
switch (status) { switch (status) {
case StatusType::UNKNOWN:
return "unknown";
case StatusType::EMPTY: case StatusType::EMPTY:
return "empty"; return "empty";
case StatusType::OPEN: case StatusType::OPEN:
@ -245,6 +243,9 @@ namespace triagens {
return "collection-requested"; return "collection-requested";
case StatusType::COLLECTED: case StatusType::COLLECTED:
return "collected"; return "collected";
case StatusType::UNKNOWN:
default:
return "unknown";
} }
} }

2
lib/BasicsC/hashes.c
View File

@ -585,7 +585,7 @@ uint32_t TRI_Crc32HashPointer (void const* data, size_t length) {
/// @brief computes a CRC32 for strings /// @brief computes a CRC32 for strings
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
uint64_t TRI_Crc32HashString (char const* data) { uint32_t TRI_Crc32HashString (char const* data) {
uint32_t crc; uint32_t crc;
uint8_t const* ptr; uint8_t const* ptr;

2
lib/BasicsC/hashes.h
View File

@ -134,7 +134,7 @@ uint32_t TRI_Crc32HashPointer (void const*, size_t);
/// @brief computes a CRC32 for strings /// @brief computes a CRC32 for strings
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
uint64_t TRI_Crc32HashString (char const*); uint32_t TRI_Crc32HashString (char const*);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}