Merge pull request #405 from giuseppe/add-clang-format

code: add clang-format
containers · Oct 2, 2023 · 9aba87b · 9aba87b
2 parents 40e0f3c + ba472b5
commit 9aba87b
Show file tree

Hide file tree

Showing 12 changed files with 569 additions and 459 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,117 @@
+---
+BasedOnStyle:  GNU
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: All
+AlwaysBreakAfterReturnType: AllDefinitions
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
+BinPackArguments: true
+BinPackParameters: true
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: false
+AllowShortBlocksOnASingleLine: false
+BreakBeforeBraces: Allman
+BraceWrapping:
+  AfterCaseLabel:  true
+  AfterClass:      true
+  AfterControlStatement: true
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: true
+  AfterStruct:     true
+  AfterUnion:      true
+  BeforeCatch:     true
+  BeforeElse:      true
+  IndentBraces:    true
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit: 0
+ContinuationIndentWidth: 4
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: false
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentCaseLabels: false
+IndentGotoLabels: true
+IndentPPDirectives: AfterHash
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: true
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: Always
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+TabWidth:        8
+UseCRLF:         false
+UseTab:          Never
+...
diff --git a/Makefile.am b/Makefile.am
@@ -36,3 +36,6 @@ srpm: dist-gzip fuse-overlayfs.spec
 	echo $(VERSION)
 	$(MAKE) -C $(WD) dist-xz
 	rpmbuild -bs --define "_sourcedir $(WD)" --define "_specdir $(WD)" --define "_builddir $(WD)" --define "_srcrpmdir $(WD)" --define "_rpmdir $(WD)" --define "_buildrootdir $(WD)/.build" fuse-overlayfs.spec
+
+clang-format:
+	git ls-files | grep -E "\\.[hc]$$" | grep -v "^lib/" | xargs clang-format -style=file -i
diff --git a/direct.c b/direct.c
@@ -76,7 +76,7 @@ direct_fstat (struct ovl_layer *l, int fd, const char *path, unsigned int mask,
 #ifdef HAVE_STATX
   struct statx stx;
 
-  ret = statx (fd, "", AT_STATX_DONT_SYNC|AT_EMPTY_PATH, mask, &stx);
+  ret = statx (fd, "", AT_STATX_DONT_SYNC | AT_EMPTY_PATH, mask, &stx);
   if (ret < 0 && (errno == ENOSYS || errno == EINVAL))
     goto fallback;
   if (ret == 0)
@@ -88,7 +88,7 @@ direct_fstat (struct ovl_layer *l, int fd, const char *path, unsigned int mask,
   return ret;
 #endif
 
- fallback:
+fallback:
   ret = fstat (fd, st);
   if (ret != 0)
     return ret;
@@ -103,7 +103,7 @@ direct_statat (struct ovl_layer *l, const char *path, struct stat *st, int flags
 #ifdef HAVE_STATX
   struct statx stx;
 
-  ret = statx (l->fd, path, AT_STATX_DONT_SYNC|flags, mask, &stx);
+  ret = statx (l->fd, path, AT_STATX_DONT_SYNC | flags, mask, &stx);
   if (ret < 0 && (errno == ENOSYS || errno == EINVAL))
     goto fallback;
   if (ret == 0)
@@ -114,7 +114,7 @@ direct_statat (struct ovl_layer *l, const char *path, struct stat *st, int flags
 
   return ret;
 #endif
- fallback:
+fallback:
   ret = fstatat (l->fd, path, st, flags);
   if (ret != 0)
     return ret;
@@ -212,24 +212,22 @@ direct_support_acls (struct ovl_layer *l)
   char value[32];
 
   return fgetxattr (l->fd, ACL_XATTR, value, sizeof (value)) >= 0
-    || errno != ENOTSUP;
+         || errno != ENOTSUP;
 }
 
-
-struct data_source direct_access_ds =
-  {
-   .num_of_layers = direct_num_of_layers,
-   .load_data_source = direct_load_data_source,
-   .cleanup = direct_cleanup,
-   .file_exists = direct_file_exists,
-   .statat = direct_statat,
-   .fstat = direct_fstat,
-   .opendir = direct_opendir,
-   .readdir = direct_readdir,
-   .closedir = direct_closedir,
-   .openat = direct_openat,
-   .getxattr = direct_getxattr,
-   .listxattr = direct_listxattr,
-   .readlinkat = direct_readlinkat,
-   .support_acls = direct_support_acls,
-  };
+struct data_source direct_access_ds = {
+  .num_of_layers = direct_num_of_layers,
+  .load_data_source = direct_load_data_source,
+  .cleanup = direct_cleanup,
+  .file_exists = direct_file_exists,
+  .statat = direct_statat,
+  .fstat = direct_fstat,
+  .opendir = direct_opendir,
+  .readdir = direct_readdir,
+  .closedir = direct_closedir,
+  .openat = direct_openat,
+  .getxattr = direct_getxattr,
+  .listxattr = direct_listxattr,
+  .readlinkat = direct_readlinkat,
+  .support_acls = direct_support_acls,
+};
diff --git a/fuse-overlayfs.h b/fuse-overlayfs.h
@@ -16,15 +16,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef FUSE_OVERLAYFS_H
-# define FUSE_OVERLAYFS_H
-# define _GNU_SOURCE
+#define FUSE_OVERLAYFS_H
+#define _GNU_SOURCE
 
-# include <sys/stat.h>
-# include <plugin-manager.h>
-# include <stdbool.h>
-# include <sys/types.h>
+#include <sys/stat.h>
+#include <plugin-manager.h>
+#include <stdbool.h>
+#include <sys/types.h>
 
-# define ACL_XATTR "system.posix_acl_default"
+#define ACL_XATTR "system.posix_acl_default"
 
 typedef struct hash_table Hash_table;
 
@@ -143,39 +143,39 @@ struct ovl_layer
 struct data_source
 {
   int (*num_of_layers) (const char *opaque, const char *path);
-  int (*load_data_source)(struct ovl_layer *l, const char *opaque, const char *path, int n_layer);
-  int (*cleanup)(struct ovl_layer *l);
-  int (*file_exists)(struct ovl_layer *l, const char *pathname);
-  int (*statat)(struct ovl_layer *l, const char *path, struct stat *st, int flags, unsigned int mask);
-  int (*fstat)(struct ovl_layer *l, int fd, const char *path, unsigned int mask, struct stat *st);
-  void *(*opendir)(struct ovl_layer *l, const char *path);
-  struct dirent *(*readdir)(void *dirp);
-  int (*closedir)(void *dirp);
-  int (*openat)(struct ovl_layer *l, const char *path, int flags, mode_t mode);
-  int (*listxattr)(struct ovl_layer *l, const char *path, char *buf, size_t size);
-  int (*getxattr)(struct ovl_layer *l, const char *path, const char *name, char *buf, size_t size);
-  ssize_t (*readlinkat)(struct ovl_layer *l, const char *path, char *buf, size_t bufsiz);
-  bool (*support_acls)(struct ovl_layer *l);
+  int (*load_data_source) (struct ovl_layer *l, const char *opaque, const char *path, int n_layer);
+  int (*cleanup) (struct ovl_layer *l);
+  int (*file_exists) (struct ovl_layer *l, const char *pathname);
+  int (*statat) (struct ovl_layer *l, const char *path, struct stat *st, int flags, unsigned int mask);
+  int (*fstat) (struct ovl_layer *l, int fd, const char *path, unsigned int mask, struct stat *st);
+  void *(*opendir) (struct ovl_layer *l, const char *path);
+  struct dirent *(*readdir) (void *dirp);
+  int (*closedir) (void *dirp);
+  int (*openat) (struct ovl_layer *l, const char *path, int flags, mode_t mode);
+  int (*listxattr) (struct ovl_layer *l, const char *path, char *buf, size_t size);
+  int (*getxattr) (struct ovl_layer *l, const char *path, const char *name, char *buf, size_t size);
+  ssize_t (*readlinkat) (struct ovl_layer *l, const char *path, char *buf, size_t bufsiz);
+  bool (*support_acls) (struct ovl_layer *l);
 };
 
 /* passthrough to the file system.  */
 extern struct data_source direct_access_ds;
 
-# ifndef HAVE_STATX
-#  define STATX_TYPE		0x00000001U	/* Want/got stx_mode & S_IFMT */
-#  define STATX_MODE		0x00000002U	/* Want/got stx_mode & ~S_IFMT */
-#  define STATX_NLINK		0x00000004U	/* Want/got stx_nlink */
-#  define STATX_UID		0x00000008U	/* Want/got stx_uid */
-#  define STATX_GID		0x00000010U	/* Want/got stx_gid */
-#  define STATX_ATIME		0x00000020U	/* Want/got stx_atime */
-#  define STATX_MTIME		0x00000040U	/* Want/got stx_mtime */
-#  define STATX_CTIME		0x00000080U	/* Want/got stx_ctime */
-#  define STATX_INO		0x00000100U	/* Want/got stx_ino */
-#  define STATX_SIZE		0x00000200U	/* Want/got stx_size */
-#  define STATX_BLOCKS		0x00000400U	/* Want/got stx_blocks */
-#  define STATX_BASIC_STATS	0x000007ffU	/* The stuff in the normal stat struct */
-#  define STATX_BTIME		0x00000800U	/* Want/got stx_btime */
-#  define STATX_ALL		0x00000fffU	/* All currently supported flags */
-# endif
+#ifndef HAVE_STATX
+#  define STATX_TYPE 0x00000001U        /* Want/got stx_mode & S_IFMT */
+#  define STATX_MODE 0x00000002U        /* Want/got stx_mode & ~S_IFMT */
+#  define STATX_NLINK 0x00000004U       /* Want/got stx_nlink */
+#  define STATX_UID 0x00000008U         /* Want/got stx_uid */
+#  define STATX_GID 0x00000010U         /* Want/got stx_gid */
+#  define STATX_ATIME 0x00000020U       /* Want/got stx_atime */
+#  define STATX_MTIME 0x00000040U       /* Want/got stx_mtime */
+#  define STATX_CTIME 0x00000080U       /* Want/got stx_ctime */
+#  define STATX_INO 0x00000100U         /* Want/got stx_ino */
+#  define STATX_SIZE 0x00000200U        /* Want/got stx_size */
+#  define STATX_BLOCKS 0x00000400U      /* Want/got stx_blocks */
+#  define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */
+#  define STATX_BTIME 0x00000800U       /* Want/got stx_btime */
+#  define STATX_ALL 0x00000fffU         /* All currently supported flags */
+#endif
 
 #endif
diff --git a/fuse_overlayfs_error.h b/fuse_overlayfs_error.h
@@ -17,24 +17,26 @@
 */
 
 #ifndef FUSE_OVERLAYFS_ERROR_H
-# define FUSE_OVERLAYFS_ERROR_H
+#define FUSE_OVERLAYFS_ERROR_H
 
-# include <config.h>
+#include <config.h>
 
-# ifdef HAVE_ERROR_H
+#ifdef HAVE_ERROR_H
 #  include <error.h>
-# else
-#  define error(status, errno, fmt, ...) do {                           \
-    if (errno == 0)                                                     \
-      fprintf (stderr, "fuse-overlayfs: " fmt "\n", ##__VA_ARGS__);     \
-    else                                                                \
+#else
+#  define error(status, errno, fmt, ...)                                \
+    do                                                                  \
       {                                                                 \
-        fprintf (stderr, "fuse-overlayfs: " fmt, ##__VA_ARGS__);        \
-        fprintf (stderr, ": %s\n", strerror (errno));                   \
-      }                                                                 \
-    if (status)                                                         \
-      exit (status);                                                    \
-  } while(0)
-# endif
+        if (errno == 0)                                                 \
+          fprintf (stderr, "fuse-overlayfs: " fmt "\n", ##__VA_ARGS__); \
+        else                                                            \
+          {                                                             \
+            fprintf (stderr, "fuse-overlayfs: " fmt, ##__VA_ARGS__);    \
+            fprintf (stderr, ": %s\n", strerror (errno));               \
+          }                                                             \
+        if (status)                                                     \
+          exit (status);                                                \
+    } while (0)
+#endif
 
 #endif