From 3d4d65056a92049fb3cbda7ccf8b333adbc90c7c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 13 Nov 2024 08:54:50 +0100 Subject: [PATCH] clang-format: bump clang-format version to latest Fedora 41 We use clang-format for formatting the code. The actual formatting depends on the version of clang-format, as the tool improves, the formatting slightly changes. We thus need to agree on which version to use. The used version is the one that gets check in the github test, and it's the one from a recent Fedora release. Now, with Fedora 41 out, bump the version from 18.1.8-1.fc40 to 19.1.0-1.fc41. --- .github/workflows/ci.yml | 2 +- include/base/nl-base-utils.h | 2 +- lib/route/neightbl.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ad5fd2f..f34d900c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: clang-format: runs-on: ubuntu-latest container: - image: fedora:40 + image: fedora:41 steps: - name: Install packages run: | diff --git a/include/base/nl-base-utils.h b/include/base/nl-base-utils.h index a7351346..3871b1ea 100644 --- a/include/base/nl-base-utils.h +++ b/include/base/nl-base-utils.h @@ -193,7 +193,7 @@ /* This is also defined in stddef.h */ #ifndef offsetof -#define offsetof(TYPE, MEMBER) ((size_t) & ((TYPE *)0)->MEMBER) +#define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER) #endif /*****************************************************************************/ diff --git a/lib/route/neightbl.c b/lib/route/neightbl.c index 8d5db8a3..1f46ad5e 100644 --- a/lib/route/neightbl.c +++ b/lib/route/neightbl.c @@ -189,7 +189,7 @@ static uint64_t neightbl_compare(struct nl_object *_a, struct nl_object *_b, !(b->ce_mask & NEIGHTBL_ATTR_PARMS)) return diff; - /* XXX: FIXME: Compare parameter table */ + /* XXX: FIXME: Compare parameter table */ #if 0 #define REQ(F) (fp->ntp_mask & NEIGHTBLPARM_ATTR_##F)