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

Prohibit verbose strcat

Browse Source 
Using strcat directly is more readable than passing strlen
of the copied string to strncat.
This commit is contained in:
Ján Tomko 2016-02-03 09:48:40 +01:00
parent 4d569245f0
commit 28e5655de3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cfg.mk
View File

@ -1031,6 +1031,12 @@ sc_prohibit_not_strneq:
halt='Use STREQ instead of !STRNEQ' \ halt='Use STREQ instead of !STRNEQ' \
$(_sc_search_regexp) $(_sc_search_regexp)
sc_prohibit_verbose_strcat:
@prohibit='strncat\([^,]*,\s+([^,]*),\s+strlen\(\1\)\)' \
in_vc_files='\.[ch]$$' \
halt='Use strcat(a, b) instead of strncat(a, b, strlen(b))' \
$(_sc_search_regexp)
# We don't use this feature of maint.mk. # We don't use this feature of maint.mk.
prev_version_file = /dev/null prev_version_file = /dev/null

4
src/storage/storage_backend_logical.c
View File

@ -123,11 +123,11 @@ virStorageBackendLogicalParseVolExtents(virStorageVolDefPtr vol,
/* Allocate space for 'nextents' regex_unit strings plus a comma for each */ /* Allocate space for 'nextents' regex_unit strings plus a comma for each */
if (VIR_ALLOC_N(regex, nextents * (strlen(regex_unit) + 1) + 1) < 0) if (VIR_ALLOC_N(regex, nextents * (strlen(regex_unit) + 1) + 1) < 0)
goto cleanup; goto cleanup;
strncat(regex, regex_unit, strlen(regex_unit)); strcat(regex, regex_unit);
for (i = 1; i < nextents; i++) { for (i = 1; i < nextents; i++) {
/* "," is the separator of "devices" field */ /* "," is the separator of "devices" field */
strcat(regex, ","); strcat(regex, ",");
strncat(regex, regex_unit, strlen(regex_unit)); strcat(regex, regex_unit);
} }
if (VIR_ALLOC(reg) < 0) if (VIR_ALLOC(reg) < 0)