system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge: branch 'th/gcc-14-fixes-2'

Browse source 
[th/gcc-14-fixes-2] avoid compiler warnings with GCC 14 (systemd)

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1859
This commit is contained in:
Íñigo Huguet 2024-02-09 08:28:02 +00:00
parent 806a86fc8a 7f2a32fa11
commit 5ec6c72abc
7 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -1157,7 +1157,12 @@ fi
NM_COMPILER_WARNINGS(AM_CFLAGS, ${more_warnings_default})
NM_COMPILER_WARNING_FLAG(LIBSYSTEMD_NM_CFLAGS, "-Wno-gnu-variable-sized-type-not-at-end")
for w in \
-Wno-nonnull-compare \
-Wno-calloc-transposed-args \
; do
NM_COMPILER_WARNING_FLAG(LIBSYSTEMD_NM_CFLAGS, "$w")
done
AC_SUBST(LIBSYSTEMD_NM_CFLAGS)
CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\

17
src/core/nm-audit-manager.c
View file

@ -185,13 +185,16 @@ nm_audit_log(NMAuditManager *self,
priv = NM_AUDIT_MANAGER_GET_PRIVATE(self);
if (priv->auditd_fd >= 0) {
audit_log_user_message(priv->auditd_fd,
AUDIT_USYS_CONFIG,
build_message(&strbuf, BACKEND_AUDITD, fields),
NULL,
NULL,
NULL,
success);
int r;
r = audit_log_user_message(priv->auditd_fd,
AUDIT_USYS_CONFIG,
build_message(&strbuf, BACKEND_AUDITD, fields),
NULL,
NULL,
NULL,
success);
(void) r;
}
#endif

2
src/core/tests/config/test-config.c
View file

@ -1076,7 +1076,7 @@ _set_values_intern_atomic_section_2_set(NMConfig *config,
g_key_file_set_value(keyfile,
NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN "with-whitespace",
"key2",
" b c\\, d ");
" b c\\\\, d ");
*out_expected_changes = NM_CONFIG_CHANGE_CAUSE_SET_VALUES | NM_CONFIG_CHANGE_VALUES
| NM_CONFIG_CHANGE_VALUES_INTERN;
}

3
src/libnm-lldp/nm-lldp-neighbor.c
View file

@ -648,9 +648,10 @@ nm_lldp_neighbor_tlv_get_oui(NMLldpNeighbor *n, uint8_t oui[static 3], uint8_t *
int r;
g_return_val_if_fail(n, -EINVAL);
g_return_val_if_fail(oui, -EINVAL);
g_return_val_if_fail(subtype, -EINVAL);
nm_assert(oui);
r = nm_lldp_neighbor_tlv_is_type(n, NM_LLDP_TYPE_PRIVATE);
if (r < 0)
return r;

1
src/libnm-systemd-core/meson.build
View file

@ -28,6 +28,7 @@ libnm_systemd_core = static_library(
top_inc,
src_inc,
],
c_args: libnm_systemd_common_cflags,
dependencies: [
libnm_systemd_shared_dep_inc,
glib_dep,

1
src/libnm-systemd-shared/meson.build
View file

@ -58,6 +58,7 @@ libnm_systemd_shared = static_library(
top_inc,
src_inc,
],
c_args: libnm_systemd_common_cflags,
dependencies: glib_dep,
)

9
src/meson.build
View file

@ -69,6 +69,15 @@ libn_dhcp4 = static_library(
###############################################################################
libnm_systemd_common_cflags = [ ]
libnm_systemd_common_cflags += cc.get_supported_arguments([
'-Wno-nonnull-compare',
'-Wno-calloc-transposed-args',
])
###############################################################################
subdir('libnm-std-aux')
subdir('libnm-glib-aux')
subdir('libnm-log-null')