mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
util: Remove return value from virTypedParamsCopy
It is already nonfallible, so just change the return type to void. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
539e851c5d
commit
15c11a7e54
@ -3258,8 +3258,7 @@ virDomainMigrateVersion3Full(virDomainPtr domain,
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (virTypedParamsCopy(&tmp, params, nparams) < 0)
|
virTypedParamsCopy(&tmp, params, nparams);
|
||||||
return NULL;
|
|
||||||
params = tmp;
|
params = tmp;
|
||||||
|
|
||||||
ret = VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
|
ret = VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
|
||||||
|
@ -420,8 +420,7 @@ virIdentity *virIdentityNewCopy(virIdentity *src)
|
|||||||
{
|
{
|
||||||
g_autoptr(virIdentity) ident = virIdentityNew();
|
g_autoptr(virIdentity) ident = virIdentityNew();
|
||||||
|
|
||||||
if (virTypedParamsCopy(&ident->params, src->params, src->nparams) < 0)
|
virTypedParamsCopy(&ident->params, src->params, src->nparams);
|
||||||
return NULL;
|
|
||||||
ident->nparams = src->nparams;
|
ident->nparams = src->nparams;
|
||||||
ident->maxparams = src->nparams;
|
ident->maxparams = src->nparams;
|
||||||
|
|
||||||
@ -826,8 +825,8 @@ int virIdentitySetParameters(virIdentity *ident,
|
|||||||
ident->params = NULL;
|
ident->params = NULL;
|
||||||
ident->nparams = 0;
|
ident->nparams = 0;
|
||||||
ident->maxparams = 0;
|
ident->maxparams = 0;
|
||||||
if (virTypedParamsCopy(&ident->params, params, nparams) < 0)
|
|
||||||
return -1;
|
virTypedParamsCopy(&ident->params, params, nparams);
|
||||||
ident->nparams = nparams;
|
ident->nparams = nparams;
|
||||||
ident->maxparams = nparams;
|
ident->maxparams = nparams;
|
||||||
|
|
||||||
@ -839,8 +838,7 @@ virTypedParamList *virIdentityGetParameters(virIdentity *ident)
|
|||||||
{
|
{
|
||||||
virTypedParameter *tmp = NULL;
|
virTypedParameter *tmp = NULL;
|
||||||
|
|
||||||
if (virTypedParamsCopy(&tmp, ident->params, ident->nparams) < 0)
|
virTypedParamsCopy(&tmp, ident->params, ident->nparams);
|
||||||
return NULL;
|
|
||||||
|
|
||||||
return virTypedParamListFromParams(&tmp, ident->nparams);
|
return virTypedParamListFromParams(&tmp, ident->nparams);
|
||||||
}
|
}
|
||||||
|
@ -347,7 +347,7 @@ virTypedParamsReplaceString(virTypedParameterPtr *params,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int
|
void
|
||||||
virTypedParamsCopy(virTypedParameterPtr *dst,
|
virTypedParamsCopy(virTypedParameterPtr *dst,
|
||||||
virTypedParameterPtr src,
|
virTypedParameterPtr src,
|
||||||
int nparams)
|
int nparams)
|
||||||
@ -356,7 +356,7 @@ virTypedParamsCopy(virTypedParameterPtr *dst,
|
|||||||
|
|
||||||
*dst = NULL;
|
*dst = NULL;
|
||||||
if (!src || nparams <= 0)
|
if (!src || nparams <= 0)
|
||||||
return 0;
|
return;
|
||||||
|
|
||||||
*dst = g_new0(virTypedParameter, nparams);
|
*dst = g_new0(virTypedParameter, nparams);
|
||||||
|
|
||||||
@ -369,8 +369,6 @@ virTypedParamsCopy(virTypedParameterPtr *dst,
|
|||||||
(*dst)[i].value = src[i].value;
|
(*dst)[i].value = src[i].value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -86,9 +86,9 @@ int virTypedParamsReplaceString(virTypedParameterPtr *params,
|
|||||||
const char *name,
|
const char *name,
|
||||||
const char *value);
|
const char *value);
|
||||||
|
|
||||||
int virTypedParamsCopy(virTypedParameterPtr *dst,
|
void virTypedParamsCopy(virTypedParameterPtr *dst,
|
||||||
virTypedParameterPtr src,
|
virTypedParameterPtr src,
|
||||||
int nparams);
|
int nparams);
|
||||||
|
|
||||||
char *virTypedParameterToString(virTypedParameterPtr param);
|
char *virTypedParameterToString(virTypedParameterPtr param);
|
||||||
|
|
||||||
|
@ -3144,8 +3144,7 @@ vzDomainMigratePerformP2P(virDomainObj *dom,
|
|||||||
int ret = -1;
|
int ret = -1;
|
||||||
int maxparams = nparams;
|
int maxparams = nparams;
|
||||||
|
|
||||||
if (virTypedParamsCopy(¶ms, orig_params, nparams) < 0)
|
virTypedParamsCopy(¶ms, orig_params, nparams);
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (!(dconn = virConnectOpen(dconnuri)))
|
if (!(dconn = virConnectOpen(dconnuri)))
|
||||||
goto done;
|
goto done;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user