mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
merge: branch 'th/gcc-14-fixes-2'
[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:
commit
5ec6c72abc
|
@ -1157,7 +1157,12 @@ fi
|
||||||
|
|
||||||
NM_COMPILER_WARNINGS(AM_CFLAGS, ${more_warnings_default})
|
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)
|
AC_SUBST(LIBSYSTEMD_NM_CFLAGS)
|
||||||
|
|
||||||
CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
|
CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
|
||||||
|
|
|
@ -185,13 +185,16 @@ nm_audit_log(NMAuditManager *self,
|
||||||
priv = NM_AUDIT_MANAGER_GET_PRIVATE(self);
|
priv = NM_AUDIT_MANAGER_GET_PRIVATE(self);
|
||||||
|
|
||||||
if (priv->auditd_fd >= 0) {
|
if (priv->auditd_fd >= 0) {
|
||||||
audit_log_user_message(priv->auditd_fd,
|
int r;
|
||||||
AUDIT_USYS_CONFIG,
|
|
||||||
build_message(&strbuf, BACKEND_AUDITD, fields),
|
r = audit_log_user_message(priv->auditd_fd,
|
||||||
NULL,
|
AUDIT_USYS_CONFIG,
|
||||||
NULL,
|
build_message(&strbuf, BACKEND_AUDITD, fields),
|
||||||
NULL,
|
NULL,
|
||||||
success);
|
NULL,
|
||||||
|
NULL,
|
||||||
|
success);
|
||||||
|
(void) r;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1076,7 +1076,7 @@ _set_values_intern_atomic_section_2_set(NMConfig *config,
|
||||||
g_key_file_set_value(keyfile,
|
g_key_file_set_value(keyfile,
|
||||||
NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN "with-whitespace",
|
NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN "with-whitespace",
|
||||||
"key2",
|
"key2",
|
||||||
" b c\\, d ");
|
" b c\\\\, d ");
|
||||||
*out_expected_changes = NM_CONFIG_CHANGE_CAUSE_SET_VALUES | NM_CONFIG_CHANGE_VALUES
|
*out_expected_changes = NM_CONFIG_CHANGE_CAUSE_SET_VALUES | NM_CONFIG_CHANGE_VALUES
|
||||||
| NM_CONFIG_CHANGE_VALUES_INTERN;
|
| NM_CONFIG_CHANGE_VALUES_INTERN;
|
||||||
}
|
}
|
||||||
|
|
|
@ -648,9 +648,10 @@ nm_lldp_neighbor_tlv_get_oui(NMLldpNeighbor *n, uint8_t oui[static 3], uint8_t *
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
g_return_val_if_fail(n, -EINVAL);
|
g_return_val_if_fail(n, -EINVAL);
|
||||||
g_return_val_if_fail(oui, -EINVAL);
|
|
||||||
g_return_val_if_fail(subtype, -EINVAL);
|
g_return_val_if_fail(subtype, -EINVAL);
|
||||||
|
|
||||||
|
nm_assert(oui);
|
||||||
|
|
||||||
r = nm_lldp_neighbor_tlv_is_type(n, NM_LLDP_TYPE_PRIVATE);
|
r = nm_lldp_neighbor_tlv_is_type(n, NM_LLDP_TYPE_PRIVATE);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
|
|
|
@ -28,6 +28,7 @@ libnm_systemd_core = static_library(
|
||||||
top_inc,
|
top_inc,
|
||||||
src_inc,
|
src_inc,
|
||||||
],
|
],
|
||||||
|
c_args: libnm_systemd_common_cflags,
|
||||||
dependencies: [
|
dependencies: [
|
||||||
libnm_systemd_shared_dep_inc,
|
libnm_systemd_shared_dep_inc,
|
||||||
glib_dep,
|
glib_dep,
|
||||||
|
|
|
@ -58,6 +58,7 @@ libnm_systemd_shared = static_library(
|
||||||
top_inc,
|
top_inc,
|
||||||
src_inc,
|
src_inc,
|
||||||
],
|
],
|
||||||
|
c_args: libnm_systemd_common_cflags,
|
||||||
dependencies: glib_dep,
|
dependencies: glib_dep,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -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-std-aux')
|
||||||
subdir('libnm-glib-aux')
|
subdir('libnm-glib-aux')
|
||||||
subdir('libnm-log-null')
|
subdir('libnm-log-null')
|
||||||
|
|
Loading…
Reference in a new issue