mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
clang-format: reformat code with clang-format 15.0.4-1.fc37
This is the version shipped in Fedora 37. As Fedora 37 is now out, the core developers switch to it. Our gitlab-ci will also use that as base image for the check-{patch.tree} tests and to generate the pages. There is a need that everybody agrees on which clang-format version to use, and that version should be the one of the currently used Fedora release. Also update the used Fedora image in "contrib/scripts/nm-code-format-container.sh" script. The gitlab-ci still needs update in the following commit. The change in isolation will break the "check-tree" test.
This commit is contained in:
parent
fe7bea9685
commit
3fb8c0f614
|
@ -10,7 +10,7 @@ die() {
|
|||
DIR="$(realpath "$(dirname "$0")/../../")"
|
||||
cd "$DIR"
|
||||
|
||||
FEDORA_VERSION=36
|
||||
FEDORA_VERSION=37
|
||||
|
||||
PODNAME="nm-code-format-f$FEDORA_VERSION"
|
||||
|
||||
|
|
|
@ -208,7 +208,8 @@ NMDevice *nm_device_factory_create_device(NMDeviceFactory *factory,
|
|||
\
|
||||
NM_DEVICE_FACTORY_DECLARE_TYPES(st_code) \
|
||||
\
|
||||
static void nm_##lower##_device_factory_init(NM##mixed##DeviceFactory *self) {} \
|
||||
static void nm_##lower##_device_factory_init(NM##mixed##DeviceFactory *self) \
|
||||
{} \
|
||||
\
|
||||
static void nm_##lower##_device_factory_class_init(NM##mixed##DeviceFactoryClass *klass) \
|
||||
{ \
|
||||
|
|
|
@ -3863,7 +3863,7 @@ nm_utils_dhcp_client_id_duid(guint32 iaid, const guint8 *duid, gsize duid_len)
|
|||
guint8 type;
|
||||
guint32 iaid;
|
||||
guint8 duid[];
|
||||
} * client_id;
|
||||
} *client_id;
|
||||
gsize total_size;
|
||||
|
||||
/* the @duid must include the 16 bit duid-type and the data (of max 128 bytes). */
|
||||
|
@ -3913,7 +3913,7 @@ nm_utils_dhcp_client_id_systemd_node_specific_full(guint32 iaid,
|
|||
} en;
|
||||
};
|
||||
} duid;
|
||||
} * client_id;
|
||||
} *client_id;
|
||||
guint64 u64;
|
||||
|
||||
g_return_val_if_fail(machine_id, NULL);
|
||||
|
|
|
@ -3099,7 +3099,7 @@ check_dbus_properties:
|
|||
const struct {
|
||||
const char *dbus_type;
|
||||
GType default_gtype;
|
||||
} * p_expected_type, *p_expected_type_2,
|
||||
} *p_expected_type, *p_expected_type_2,
|
||||
expected_types[] = {
|
||||
{"b", G_TYPE_BOOLEAN}, {"q", G_TYPE_UINT},
|
||||
{"y", G_TYPE_UCHAR}, {"i", G_TYPE_INT},
|
||||
|
|
|
@ -8475,7 +8475,7 @@ test_nm_utils_strstrdictkey(void)
|
|||
const char *v1;
|
||||
const char *v2;
|
||||
NMUtilsStrStrDictKey *v_static;
|
||||
} * val1, *val2,
|
||||
} *val1, *val2,
|
||||
values[] = {
|
||||
{NULL, NULL},
|
||||
{"", NULL},
|
||||
|
|
|
@ -1010,7 +1010,7 @@ nm_g_variant_equal(GVariant *a, GVariant *b)
|
|||
const typeof(flags) _flags = (flags); \
|
||||
const typeof(flags) _val = (val); \
|
||||
\
|
||||
_flags &(~_val); \
|
||||
_flags & (~_val); \
|
||||
})
|
||||
|
||||
#define NM_FLAGS_ASSIGN(flags, val, assign) \
|
||||
|
@ -1018,7 +1018,7 @@ nm_g_variant_equal(GVariant *a, GVariant *b)
|
|||
const typeof(flags) _flags = (flags); \
|
||||
const typeof(flags) _val = (val); \
|
||||
\
|
||||
(assign) ? _flags | (_val) : _flags &(~_val); \
|
||||
(assign) ? _flags | (_val) : _flags & (~_val); \
|
||||
})
|
||||
|
||||
#define NM_FLAGS_ASSIGN_MASK(flags, mask, val) \
|
||||
|
|
|
@ -2723,7 +2723,8 @@ _nmtst_variant_new_vardict(int dummy, ...)
|
|||
G_STMT_END
|
||||
#else
|
||||
#define _nmtst_assert_variant_bytestring_cmp_str(_ptr, _ptr2, _len) \
|
||||
G_STMT_START {} \
|
||||
G_STMT_START \
|
||||
{} \
|
||||
G_STMT_END
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue