Merge pull request #65 from thbeu/apply-formatting

Apply formatting
OSGeo · Nov 8, 2023 · fad7e6c · fad7e6c
2 parents 7a0e253 + 399a76e
commit fad7e6c
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 12 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,71 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: true
+AlignConsecutiveAssignments: false
+AlignEscapedNewlinesLeft: false
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IndentCaseLabels: true
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 1000000000
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+ReflowComments: false
+SortIncludes: false
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        4
+UseTab:          Never
+
+---
+Language: Json
+BasedOnStyle: llvm
diff --git a/contrib/csv2shp.c b/contrib/csv2shp.c
@@ -156,7 +156,7 @@ int str_to_ndecimals(const char *s)
         return -1;
     }
 
-    const char* decimalPoint = strchr(s, '.');
+    const char *decimalPoint = strchr(s, '.');
     if ((decimalPoint == NULL) || (strchr(decimalPoint + 1, '.') != NULL))
     {
         return -1;
@@ -341,9 +341,8 @@ int main(int argc, char **argv)
         {
             n_longitude = x;
         }
-        else
-        if (0 ==
-            STRCASECMP("Latitude", delimited_column(sbuffer, delimiter, x)))
+        else if (0 == STRCASECMP("Latitude",
+                                 delimited_column(sbuffer, delimiter, x)))
         {
             n_latitude = x;
         }

diff --git a/contrib/shpdxf.c b/contrib/shpdxf.c
@@ -283,7 +283,8 @@ int main(int argc, char **argv)
     char id[255];
 
     // Proceed to process data.
-    for (int recNum = 0; (recNum < shp_numrec) && (recNum < (int)MaxElem); recNum++)
+    for (int recNum = 0; (recNum < shp_numrec) && (recNum < (int)MaxElem);
+         recNum++)
     {
         if (idfld >= 0)
             switch (idfld_type)

diff --git a/shapefil.h b/shapefil.h
@@ -269,13 +269,15 @@ extern "C"
     SHPHandle SHPAPI_CALL SHPOpen(const char *pszShapeFile,
                                   const char *pszAccess);
     SHPHandle SHPAPI_CALL SHPOpenLL(const char *pszShapeFile,
-                                    const char *pszAccess, const SAHooks *psHooks);
+                                    const char *pszAccess,
+                                    const SAHooks *psHooks);
     SHPHandle SHPAPI_CALL SHPOpenLLEx(const char *pszShapeFile,
-                                      const char *pszAccess, const SAHooks *psHooks,
-                                      int bRestoreSHX);
+                                      const char *pszAccess,
+                                      const SAHooks *psHooks, int bRestoreSHX);
 
     int SHPAPI_CALL SHPRestoreSHX(const char *pszShapeFile,
-                                  const char *pszAccess, const SAHooks *psHooks);
+                                  const char *pszAccess,
+                                  const SAHooks *psHooks);
 
     /* If setting bFastMode = TRUE, the content of SHPReadObject() is owned by the SHPHandle. */
     /* So you cannot have 2 valid instances of SHPReadObject() simultaneously. */
@@ -483,7 +485,8 @@ extern "C"
     DBFHandle SHPAPI_CALL DBFOpen(const char *pszDBFFile,
                                   const char *pszAccess);
     DBFHandle SHPAPI_CALL DBFOpenLL(const char *pszDBFFile,
-                                    const char *pszAccess, const SAHooks *psHooks);
+                                    const char *pszAccess,
+                                    const SAHooks *psHooks);
     DBFHandle SHPAPI_CALL DBFCreate(const char *pszDBFFile);
     DBFHandle SHPAPI_CALL DBFCreateEx(const char *pszDBFFile,
                                       const char *pszCodePage);

diff --git a/shptree.c b/shptree.c
@@ -1113,8 +1113,7 @@ int SHPAPI_CALL SHPWriteTree(SHPTree *tree, const char *filename)
 /*                           SHPWriteTreeLL()                           */
 /************************************************************************/
 
-int SHPWriteTreeLL(SHPTree *tree, const char *filename,
-                   const SAHooks *psHooks)
+int SHPWriteTreeLL(SHPTree *tree, const char *filename, const SAHooks *psHooks)
 {
     char signature[4] = "SQT";
     int i;