Skip to content

Commit 39293b2

Browse files
增加代码格式化与警告检查, 重新格式化全部代码
Co-authored-by: wenxuanjun <41050170+wenxuanjun@users.noreply.github.com>
1 parent 48910e0 commit 39293b2

File tree

136 files changed

+4359
-3632
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+4359
-3632
lines changed

.clang-format

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ AlignArrayOfStructures: Left
1212
AlignConsecutiveAssignments: Consecutive
1313
AlignConsecutiveBitFields: true
1414
AlignConsecutiveDeclarations: None
15-
AlignConsecutiveMacros: None
15+
AlignConsecutiveMacros: true
1616
AlignEscapedNewlines: Right
1717
AlignOperands: Align
1818
AlignTrailingComments: true
@@ -26,8 +26,8 @@ AllowShortLoopsOnASingleLine: false
2626
AttributeMacros:
2727
- __attribute__
2828
- __declspec
29-
BinPackArguments: true
30-
BinPackParameters: true
29+
BinPackArguments: false
30+
BinPackParameters: false
3131
BraceWrapping:
3232
AfterCaseLabel: false
3333
AfterControlStatement: Never

.clang-tidy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ Checks: >
1313
-readability-implicit-bool-conversion,
1414
-readability-magic-numbers,
1515
-readability-math-missing-parentheses,
16-
-readability-uppercase-literal-suffix
16+
-readability-uppercase-literal-suffix,
17+
-bugprone-multi-level-implicit-pointer-conversion,
18+
-readability-function-cognitive-complexity,
19+
-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling
1720
1821
FormatStyle: file
1922

2023
CheckOptions:
21-
- key: readability-braces-around-statements.ShortStatementLines
22-
value: "0"
2324
- key: readability-function-size.LineThreshold
2425
value: "120"
2526
- key: readability-function-size.StatementThreshold
@@ -30,3 +31,4 @@ CheckOptions:
3031
value: "4"
3132
- key: readability-function-size.VariableThreshold
3233
value: "30"
34+
...

CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,27 @@ endif ()
9797

9898
find_program(CPPCHECK cppcheck)
9999
if (CPPCHECK)
100+
set(CPPCHECK_ARCH_DEFS "")
101+
if (TARGET_ARCH STREQUAL "x86_64")
102+
set(CPPCHECK_ARCH_DEFS -D__x86_64__=1)
103+
elseif (TARGET_ARCH STREQUAL "riscv64")
104+
set(CPPCHECK_ARCH_DEFS -D__riscv=1 -D__riscv_xlen=64)
105+
elseif (TARGET_ARCH STREQUAL "loongarch64")
106+
set(CPPCHECK_ARCH_DEFS -D__loongarch__=1 -D__loongarch_grlen=64)
107+
endif ()
100108
add_custom_target(cppcheck
101109
COMMAND ${CPPCHECK}
102110
--project=${CMAKE_BINARY_DIR}/compile_commands.json
103111
--enable=warning,style,performance,portability
112+
-D__GNUC__=1
113+
-DSIZE_MAX=0xFFFFFFFFFFFFFFFFUL
114+
${CPPCHECK_ARCH_DEFS}
104115
--suppress=missingIncludeSystem
105116
--suppress=*:${CMAKE_SOURCE_DIR}/module/fatfs/*
106117
--suppress=*:${CMAKE_SOURCE_DIR}/module/iso9660/*
107118
--suppress=*:${CMAKE_SOURCE_DIR}/src/term/flanterm/*
119+
--suppress=*:${CMAKE_SOURCE_DIR}/src/lib/*
120+
--suppress=*:${CMAKE_SOURCE_DIR}/src/include/lib/*
108121
--quiet
109122
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
110123
COMMENT "Running cppcheck..."

format.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/sh
22

33
find src/ libs/ \
4-
-path "src/lib/acpica" -prune -o \
5-
-path "src/include/lib/acpica" -prune -o \
4+
-path "src/lib" -prune -o \
5+
-path "src/include/lib" -prune -o \
66
-type f \( -name "*.c" -o -name "*.h" \) \
77
-exec clang-format -i {} +
88

module/all_include/fs_subsystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ struct vfs_node { // vfs节点
135135
uint16_t fsid; // 文件系统挂载 id
136136
void *handle; // 操作文件的句柄
137137
uint64_t flags; // 文件标志
138-
list_t child; // 子节点
138+
list_t *child; // 子节点
139139
vfs_node_t root; // 根目录
140140
bool visited; // 是否与具体文件系统同步
141141
bool is_mount; // 是否是挂载点

0 commit comments

Comments
 (0)