diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5b9ac22..27ed77d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -37,6 +37,10 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 + - name: install clang-format + run: | + pipx install clang-format==23.1.0 + echo "$HOME/.local/bin" >> "$GITHUB_PATH" - name: run style check run: | clang-format --version diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0c3e543..f7a8665 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.8 # 最新バージョンを使用 + rev: v23.1.0 # CIのstyle-checkと同じバージョンに揃える hooks: - id: clang-format - files: \.(cpp|cc|h)$ + files: ^(httplib\.h|(example|fuzzing|test)/[^/]+\.(cpp|cc|h))$ args: [-i] # インプレースで修正 \ No newline at end of file diff --git a/httplib.h b/httplib.h index 355ff41..7db99a0 100644 --- a/httplib.h +++ b/httplib.h @@ -6881,12 +6881,10 @@ inline int getaddrinfo_with_timeout(const char *node, const char *service, // actually finish before letting the stack frame go. The trade-off is that // a wedged DNS server can hold this thread for the system resolver timeout // (~30s by default) past the caller's connection timeout. - struct gaicb request {}; + struct gaicb request{}; struct gaicb *requests[1] = {&request}; - struct sigevent sevp {}; - struct timespec timeout { - timeout_sec, 0 - }; + struct sigevent sevp{}; + struct timespec timeout{timeout_sec, 0}; request.ar_name = node; request.ar_service = service;