External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDomainDeviceLoadparmIsValid: Simplify value lenght check

Browse Source 
Use the new STRLIM macro and unify it with the empty string check.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-11-25 13:32:18 +01:00
parent 8eb7471eb3
commit d23389d2b7
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/conf/domain_conf.c
View File

@ -6300,15 +6300,10 @@ virDomainDeviceLoadparmIsValid(const char *loadparm)
{
size_t i;
if (virStringIsEmpty(loadparm)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("loadparm cannot be an empty string"));
return false;
}
if (strlen(loadparm) > 8) {
if (virStringIsEmpty(loadparm) || !STRLIM(loadparm, 8)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("loadparm '%s' exceeds 8 characters"), loadparm);
_("loadparm value '%s' must be between 1 and 8 characters"),
loadparm);
return false;
}

2
tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.err
View File

@ -1 +1 @@
internal error: loadparm 'LOADPARM1' exceeds 8 characters
internal error: loadparm value 'LOADPARM1' must be between 1 and 8 characters