diff options
| author |   Daniel P. Berrange <berrange@redhat.com> | 2012-03-20 14:11:10 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-03-23 13:24:06 +0000 |
| commit | bc1ff1600ebb96dad18f797238939c052962fc8b (patch) | |
| tree | 563ee87dd4eb942ec41c60b3bb2a5d3249308174 /src/esx | |
| parent | Store parsed query parameters directly in the virURIPtr struct (diff) | |
| download | libvirt-bc1ff1600ebb96dad18f797238939c052962fc8b.tar.gz libvirt-bc1ff1600ebb96dad18f797238939c052962fc8b.tar.bz2 libvirt-bc1ff1600ebb96dad18f797238939c052962fc8b.zip | |
Convert drivers over to use virURIPtr for query params
Convert drivers currently using the qparams APIs, to instead
use the virURIPtr query parameters directly.
* src/esx/esx_util.c, src/hyperv/hyperv_util.c,
src/remote/remote_driver.c, src/xenapi/xenapi_utils.c: Remove
use of qparams
* src/util/qparams.h, src/util/qparams.c: Delete
* src/Makefile.am, src/libvirt_private.syms: Remove qparams
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'src/esx')
| -rw-r--r-- | src/esx/esx_util.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 67b07b730..a08ca19f4 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -28,7 +28,6 @@ #include "internal.h" #include "datatypes.h" -#include "qparams.h" #include "util.h" #include "memory.h" #include "logging.h" @@ -45,8 +44,6 @@ int esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri) { int result = -1; - struct qparam_set *queryParamSet = NULL; - struct qparam *queryParam = NULL; int i; int noVerify; int autoAnswer; @@ -62,14 +59,8 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri) return -1; } - queryParamSet = qparam_query_parse(uri->query); - - if (queryParamSet == NULL) { - goto cleanup; - } - - for (i = 0; i < queryParamSet->n; i++) { - queryParam = &queryParamSet->p[i]; + for (i = 0; i < uri->paramsCount; i++) { + virURIParamPtr queryParam = &uri->params[i]; if (STRCASEEQ(queryParam->name, "transport")) { VIR_FREE((*parsedUri)->transport); @@ -204,10 +195,6 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri) esxUtil_FreeParsedUri(parsedUri); } - if (queryParamSet != NULL) { - free_qparam_set(queryParamSet); - } - return result; } |