External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

syntax-check: Prohibit canonicalize_file_name()

Browse Source 
We want to make sure our wrapper is used instead in order
to keep the test suite working.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-04-30 16:55:57 +02:00
parent 3bfe72e3dd
commit 00d465bb4d
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cfg.mk
View File

@ -462,6 +462,13 @@ sc_prohibit_ctype_h:
halt='use c-ctype.h instead of ctype.h' \ halt='use c-ctype.h instead of ctype.h' \
$(_sc_search_regexp) $(_sc_search_regexp)
# We have our own wrapper for mocking purposes
sc_prohibit_canonicalize_file_name:
@prohibit='\<canonicalize_file_name\(' \
exclude='exempt from syntax-check' \
halt='use virFileCanonicalizePath() instead of canonicalize_file_name()' \
$(_sc_search_regexp)
# Insist on correct types for [pug]id. # Insist on correct types for [pug]id.
sc_correct_id_types: sc_correct_id_types:
@prohibit='\<(int|long) *[pug]id\>' \ @prohibit='\<(int|long) *[pug]id\>' \
@ -1208,6 +1215,9 @@ exclude_file_name_regexp--sc_prohibit_nonreentrant = \
exclude_file_name_regexp--sc_prohibit_select = \ exclude_file_name_regexp--sc_prohibit_select = \
^cfg\.mk$$ ^cfg\.mk$$
exclude_file_name_regexp--sc_prohibit_canonicalize_file_name = \
^cfg\.mk$$
exclude_file_name_regexp--sc_prohibit_raw_allocation = \ exclude_file_name_regexp--sc_prohibit_raw_allocation = \
^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock|commandhelper)\.c|tools/wireshark/src/packet-libvirt\.c)$$ ^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock|commandhelper)\.c|tools/wireshark/src/packet-libvirt\.c)$$

2
src/util/virfile.c
View File

@ -3309,7 +3309,7 @@ virFileSanitizePath(const char *path)
char * char *
virFileCanonicalizePath(const char *path) virFileCanonicalizePath(const char *path)
{ {
return canonicalize_file_name(path); return canonicalize_file_name(path); /* exempt from syntax-check */
} }
/** /**