Reformating

Author: RingoD

.clang-format

@@ -1,27 +1,95 @@
 ---
 BasedOnStyle: LLVM
-IndentWidth: 4
-TabWidth: 4
-AlwaysBreakTemplateDeclarations: true
-AllowShortFunctionsOnASingleLine: Inline
-BreakAfterJavaFieldAnnotations: true
-BreakBeforeBraces: Linux
-SpaceAfterCStyleCast: true
-IndentCaseLabels: true
 AccessModifierOffset: -4
-BreakBeforeBraces: Custom
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
 BraceWrapping:
-    AfterNamespace: false
     AfterClass: false
+    AfterControlStatement: false
+    AfterEnum: false
     AfterFunction: true
-
-BreakConstructorInitializersBeforeComma: true
+    AfterNamespace: false
+    AfterObjCDeclaration: false
+    AfterStruct: false
+    AfterUnion: false
+    AfterExternBlock: false
+    BeforeCatch: false
+    BeforeElse: false
+    IndentBraces: false
+    SplitEmptyFunction: true
+    SplitEmptyRecord: true
+    SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: BeforeComma
+BreakStringLiterals: false
+ColumnLimit: 0
+CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
-BinPackParameters: false
+ConstructorInitializerIndentWidth: 0
+ContinuationIndentWidth: 0
+Cpp11BracedListStyle: false
+DerivePointerAlignment: true
+FixNamespaceComments: true
+IncludeBlocks: Preserve
+IndentCaseLabels: false
+IndentPPDirectives: None  
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 1
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 1
+PenaltyBreakFirstLessLess: 1
+PenaltyBreakString: 1
+PenaltyExcessCharacter: 1
+PenaltyReturnTypeOnItsOwnLine: 1
+PointerAlignment: Right
 ReflowComments: false
+SortIncludes: true
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: true
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Auto
+TabWidth: 4
+UseTab: Never
 ---
 Language: Cpp
 ColumnLimit: 80
 ---
 Language: ObjC
-ColumnLimit: 0
+ColumnLimit: 0

common/Assertion.hpp

@@ -32,8 +32,7 @@
     }
 
 #define WCTInnerAssert(cond)                                                   \
-    WCTAssert((cond),                                                          \
-              "If you think it's a bug caused by WCDB, please report to us.")
+    WCTAssert((cond), "If you think it's a bug caused by WCDB, please report to us.")
 
 #else // DEBUG
 

common/Data.cpp

@@ -33,11 +33,11 @@ Data::Data() : m_sharedBuffer(nullptr), m_size(0), m_buffer(nullptr)
 Data::Data(const std::shared_ptr<std::vector<unsigned char>> &sharedBuffer,
            unsigned char *buffer,
            size_t size)
-    : m_sharedBuffer(sharedBuffer), m_buffer(buffer), m_size(size)
+: m_sharedBuffer(sharedBuffer), m_buffer(buffer), m_size(size)
 {
-    WCTInnerAssert(
-        m_sharedBuffer == nullptr || (m_buffer == nullptr && m_size == 0) ||
-        m_buffer + m_size <= m_sharedBuffer->data() + m_sharedBuffer->size());
+    WCTInnerAssert(m_sharedBuffer == nullptr || (m_buffer == nullptr && m_size == 0)
+                   || m_buffer + m_size
+                      <= m_sharedBuffer->data() + m_sharedBuffer->size());
 }
 
 #pragma mark - Shared
@@ -54,7 +54,7 @@ Data::Data(size_t size) : m_sharedBuffer(new std::vector<unsigned char>(size))
 }
 
 Data::Data(const unsigned char *buffer, size_t size)
-    : m_sharedBuffer(new std::vector<unsigned char>(size))
+: m_sharedBuffer(new std::vector<unsigned char>(size))
 {
     if (m_sharedBuffer != nullptr) {
         if (buffer != nullptr) {
@@ -140,8 +140,7 @@ Data Data::subdata(size_t size) const
 
 Data Data::subdata(off_t offset, size_t size) const
 {
-    WCTRemedialAssert(m_sharedBuffer == nullptr ||
-                          m_sharedBuffer->size() >= offset + size,
+    WCTRemedialAssert(m_sharedBuffer == nullptr || m_sharedBuffer->size() >= offset + size,
                       "Memory cross-border",
                       size = m_sharedBuffer->size() - (size_t) offset;);
     return Data(m_sharedBuffer, m_buffer + offset, size);

common/Data.hpp

@@ -57,8 +57,7 @@ class Data : protected SharedThreadedErrorProne {
 #pragma mark - No Shared
 public:
     static Data noCopyData(unsigned char *buffer, size_t size);
-    static const Data immutableNoCopyData(const unsigned char *buffer,
-                                          size_t size);
+    static const Data immutableNoCopyData(const unsigned char *buffer, size_t size);
 
 #pragma mark - Subdata
 public:

common/Error.cpp

@@ -66,7 +66,7 @@ Error::Error(Code code) : level(Level::Error), m_code(code)
 }
 
 Error::Error(Code code, const std::string &message_)
-    : level(Level::Error), m_code(code), message(message_)
+: level(Level::Error), m_code(code), message(message_)
 {
 }
 
@@ -94,30 +94,30 @@ void Error::setSystemCode(int systemCode, Code codeIfUnresolved)
 {
     Code code;
     switch (systemCode) {
-        case EIO:
-            code = Code::IOError;
-            break;
-        case ENOMEM:
-            code = Code::NoMemory;
-            break;
-        case EACCES:
-            code = Code::Permission;
-            break;
-        case EBUSY:
-            code = Code::Busy;
-            break;
-        case ENOSPC:
-            code = Code::Full;
-            break;
-        case EAUTH:
-            code = Code::Authorization;
-            break;
-        case ENOENT:
-            code = Code::NotFound;
-            break;
-        default:
-            code = codeIfUnresolved;
-            break;
+    case EIO:
+        code = Code::IOError;
+        break;
+    case ENOMEM:
+        code = Code::NoMemory;
+        break;
+    case EACCES:
+        code = Code::Permission;
+        break;
+    case EBUSY:
+        code = Code::Busy;
+        break;
+    case ENOSPC:
+        code = Code::Full;
+        break;
+    case EAUTH:
+        code = Code::Authorization;
+        break;
+    case ENOENT:
+        code = Code::NotFound;
+        break;
+    default:
+        code = codeIfUnresolved;
+        break;
     }
     const char *errorMessage = strerror(systemCode);
     if (errorMessage) {
@@ -150,8 +150,7 @@ bool Error::isOK() const
 
 bool Error::isCorruption() const
 {
-    return m_code == Error::Code::Corrupt ||
-           m_code == Error::Code::NotADatabase;
+    return m_code == Error::Code::Corrupt || m_code == Error::Code::NotADatabase;
 }
 
 #pragma mark - Info