External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 20:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "meson: avoid bogus warnings from clang and g_autoptr"

Browse Source 
Commit 345996c6208b281233074362a8d81295e2e711d4 disabled the
-Wunused-but-set-variable warning on CLang, beacuse it warned
on variables that were unread, but we relied on the side effects
of their destructors.

Reinstate the warning now that all the occurrences have been fixed.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2021-09-03 16:39:36 +02:00
parent eec09bcae6
commit 3376179092
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-aux/syntax-check.mk
View File

@ -1589,7 +1589,7 @@ exclude_file_name_regexp--sc_prohibit_canonicalize_file_name = \
^(build-aux/syntax-check\.mk|tests/virfilemock\.c)$$
exclude_file_name_regexp--sc_prohibit_raw_allocation = \
^(meson\.build|docs/advanced-tests\.rst|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock|commandhelper)\.c|tools/wireshark/src/packet-libvirt\.c|tools/nss/libvirt_nss(_leases|_macs)?\.c)$$
^(docs/advanced-tests\.rst|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock|commandhelper)\.c|tools/wireshark/src/packet-libvirt\.c|tools/nss/libvirt_nss(_leases|_macs)?\.c)$$
exclude_file_name_regexp--sc_prohibit_readlink = \
^src/(util/virutil|lxc/lxc_container)\.c$$

21
meson.build
View File

@ -470,27 +470,6 @@ if get_option('warning_level') == '2'
supported_cc_flags += [ '-Wno-unused-function' ]
endif
if supported_cc_flags.contains('-Wunused-but-set-variable')
# Clang complains about unused variables in many scenarios related
# to attribute((cleanup)) aka g_auto*
w_unused_but_set_var_args = [ '-Wunused-but-set-variable', '-Werror' ]
w_unused_but_set_var_code = '''
static inline void free_pointer (void *p) {
void **pp = (void**)p;
free (*pp);
}
int main(void) {
__attribute__((cleanup(free_pointer))) char *buffer = 0x0;
buffer = 0x1;
}
'''
# We previously turned on unused-but-set-variable, so we must turn
# it off again explicitly now.
if not cc.compiles(w_unused_but_set_var_code, args: w_unused_but_set_var_args)
supported_cc_flags += [ '-Wno-unused-but-set-variable' ]
endif
endif
endif
add_project_arguments(supported_cc_flags, language: 'c')