提交 e9ef8565 编写于 作者: P Pavel Boldin 提交者: Michal Privoznik

util: multi-value parameters in virTypedParamsAdd*

Allow multi-value parameters to be build using virTypedParamsAdd*
functions by removing check for duplicates.
Signed-off-by: NPavel Boldin <pboldin@mirantis.com>
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 a5250449
...@@ -749,14 +749,6 @@ virTypedParamsGetString(virTypedParameterPtr params, ...@@ -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: * virTypedParamsAddInt:
* @params: pointer to the array of typed parameters * @params: pointer to the array of typed parameters
...@@ -787,7 +779,6 @@ virTypedParamsAddInt(virTypedParameterPtr *params, ...@@ -787,7 +779,6 @@ virTypedParamsAddInt(virTypedParameterPtr *params,
virResetLastError(); virResetLastError();
VIR_TYPED_PARAM_CHECK();
if (VIR_RESIZE_N(*params, max, n, 1) < 0) if (VIR_RESIZE_N(*params, max, n, 1) < 0)
goto error; goto error;
*maxparams = max; *maxparams = max;
...@@ -835,7 +826,6 @@ virTypedParamsAddUInt(virTypedParameterPtr *params, ...@@ -835,7 +826,6 @@ virTypedParamsAddUInt(virTypedParameterPtr *params,
virResetLastError(); virResetLastError();
VIR_TYPED_PARAM_CHECK();
if (VIR_RESIZE_N(*params, max, n, 1) < 0) if (VIR_RESIZE_N(*params, max, n, 1) < 0)
goto error; goto error;
*maxparams = max; *maxparams = max;
...@@ -883,7 +873,6 @@ virTypedParamsAddLLong(virTypedParameterPtr *params, ...@@ -883,7 +873,6 @@ virTypedParamsAddLLong(virTypedParameterPtr *params,
virResetLastError(); virResetLastError();
VIR_TYPED_PARAM_CHECK();
if (VIR_RESIZE_N(*params, max, n, 1) < 0) if (VIR_RESIZE_N(*params, max, n, 1) < 0)
goto error; goto error;
*maxparams = max; *maxparams = max;
...@@ -931,7 +920,6 @@ virTypedParamsAddULLong(virTypedParameterPtr *params, ...@@ -931,7 +920,6 @@ virTypedParamsAddULLong(virTypedParameterPtr *params,
virResetLastError(); virResetLastError();
VIR_TYPED_PARAM_CHECK();
if (VIR_RESIZE_N(*params, max, n, 1) < 0) if (VIR_RESIZE_N(*params, max, n, 1) < 0)
goto error; goto error;
*maxparams = max; *maxparams = max;
...@@ -979,7 +967,6 @@ virTypedParamsAddDouble(virTypedParameterPtr *params, ...@@ -979,7 +967,6 @@ virTypedParamsAddDouble(virTypedParameterPtr *params,
virResetLastError(); virResetLastError();
VIR_TYPED_PARAM_CHECK();
if (VIR_RESIZE_N(*params, max, n, 1) < 0) if (VIR_RESIZE_N(*params, max, n, 1) < 0)
goto error; goto error;
*maxparams = max; *maxparams = max;
...@@ -1027,7 +1014,6 @@ virTypedParamsAddBoolean(virTypedParameterPtr *params, ...@@ -1027,7 +1014,6 @@ virTypedParamsAddBoolean(virTypedParameterPtr *params,
virResetLastError(); virResetLastError();
VIR_TYPED_PARAM_CHECK();
if (VIR_RESIZE_N(*params, max, n, 1) < 0) if (VIR_RESIZE_N(*params, max, n, 1) < 0)
goto error; goto error;
*maxparams = max; *maxparams = max;
...@@ -1078,7 +1064,6 @@ virTypedParamsAddString(virTypedParameterPtr *params, ...@@ -1078,7 +1064,6 @@ virTypedParamsAddString(virTypedParameterPtr *params,
virResetLastError(); virResetLastError();
VIR_TYPED_PARAM_CHECK();
if (VIR_RESIZE_N(*params, max, n, 1) < 0) if (VIR_RESIZE_N(*params, max, n, 1) < 0)
goto error; goto error;
*maxparams = max; *maxparams = max;
...@@ -1136,7 +1121,6 @@ virTypedParamsAddFromString(virTypedParameterPtr *params, ...@@ -1136,7 +1121,6 @@ virTypedParamsAddFromString(virTypedParameterPtr *params,
virResetLastError(); virResetLastError();
VIR_TYPED_PARAM_CHECK();
if (VIR_RESIZE_N(*params, max, n, 1) < 0) if (VIR_RESIZE_N(*params, max, n, 1) < 0)
goto error; goto error;
*maxparams = max; *maxparams = max;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册