From e9ef8565205bdb1438c9a5e40a3d54e29f562b4e Mon Sep 17 00:00:00 2001 From: Pavel Boldin Date: Tue, 16 Jun 2015 01:42:07 +0300 Subject: [PATCH] util: multi-value parameters in virTypedParamsAdd* Allow multi-value parameters to be build using virTypedParamsAdd* functions by removing check for duplicates. Signed-off-by: Pavel Boldin Signed-off-by: Michal Privoznik --- src/util/virtypedparam.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index 68620f58c6..6f608d648b 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -749,14 +749,6 @@ virTypedParamsGetString(virTypedParameterPtr params, } -#define VIR_TYPED_PARAM_CHECK() \ - do { if (virTypedParamsGet(*params, n, name)) { \ - virReportError(VIR_ERR_INVALID_ARG, \ - _("Parameter '%s' is already set"), name); \ - goto error; \ - } } while (0) - - /** * virTypedParamsAddInt: * @params: pointer to the array of typed parameters @@ -787,7 +779,6 @@ virTypedParamsAddInt(virTypedParameterPtr *params, virResetLastError(); - VIR_TYPED_PARAM_CHECK(); if (VIR_RESIZE_N(*params, max, n, 1) < 0) goto error; *maxparams = max; @@ -835,7 +826,6 @@ virTypedParamsAddUInt(virTypedParameterPtr *params, virResetLastError(); - VIR_TYPED_PARAM_CHECK(); if (VIR_RESIZE_N(*params, max, n, 1) < 0) goto error; *maxparams = max; @@ -883,7 +873,6 @@ virTypedParamsAddLLong(virTypedParameterPtr *params, virResetLastError(); - VIR_TYPED_PARAM_CHECK(); if (VIR_RESIZE_N(*params, max, n, 1) < 0) goto error; *maxparams = max; @@ -931,7 +920,6 @@ virTypedParamsAddULLong(virTypedParameterPtr *params, virResetLastError(); - VIR_TYPED_PARAM_CHECK(); if (VIR_RESIZE_N(*params, max, n, 1) < 0) goto error; *maxparams = max; @@ -979,7 +967,6 @@ virTypedParamsAddDouble(virTypedParameterPtr *params, virResetLastError(); - VIR_TYPED_PARAM_CHECK(); if (VIR_RESIZE_N(*params, max, n, 1) < 0) goto error; *maxparams = max; @@ -1027,7 +1014,6 @@ virTypedParamsAddBoolean(virTypedParameterPtr *params, virResetLastError(); - VIR_TYPED_PARAM_CHECK(); if (VIR_RESIZE_N(*params, max, n, 1) < 0) goto error; *maxparams = max; @@ -1078,7 +1064,6 @@ virTypedParamsAddString(virTypedParameterPtr *params, virResetLastError(); - VIR_TYPED_PARAM_CHECK(); if (VIR_RESIZE_N(*params, max, n, 1) < 0) goto error; *maxparams = max; @@ -1136,7 +1121,6 @@ virTypedParamsAddFromString(virTypedParameterPtr *params, virResetLastError(); - VIR_TYPED_PARAM_CHECK(); if (VIR_RESIZE_N(*params, max, n, 1) < 0) goto error; *maxparams = max; -- GitLab