[PATCH 24/43] util: xml: Remove virXPathLong
The function is now unused and we no longer want to promote use of the
'long' type.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_private.syms | 1 -
src/util/virxml.c | 53 ----------------------------------------
src/util/virxml.h | 4 ---
3 files changed, 58 deletions(-)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index dab3b389c8..0fc5481a26 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3693,7 +3693,6 @@ virXMLValidatorValidate;
virXPathBoolean;
virXPathContextNodeRestore;
virXPathInt;
-virXPathLong;
virXPathLongLong;
virXPathNode;
virXPathNodeSet;
diff --git a/src/util/virxml.c b/src/util/virxml.c
index d80a69f163..f5ee9284a6 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -111,38 +111,6 @@ virXPathString(const char *xpath,
}
-static int
-virXPathLongBase(const char *xpath,
- xmlXPathContextPtr ctxt,
- int base,
- long *value)
-{
- g_autoptr(xmlXPathObject) obj = NULL;
- int ret = 0;
-
- if ((ctxt == NULL) || (xpath == NULL) || (value == NULL)) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("Invalid parameter to
virXPathLong()"));
- return -1;
- }
- obj = xmlXPathEval(BAD_CAST xpath, ctxt);
- if ((obj != NULL) && (obj->type == XPATH_STRING) &&
- (obj->stringval != NULL) && (obj->stringval[0] != 0)) {
- if (virStrToLong_l((char *) obj->stringval, NULL, base, value) < 0)
- ret = -2;
- } else if ((obj != NULL) && (obj->type == XPATH_NUMBER) &&
- (!(isnan(obj->floatval)))) {
- *value = (long) obj->floatval;
- if (*value != obj->floatval)
- ret = -2;
- } else {
- ret = -1;
- }
-
- return ret;
-}
-
-
/**
* virXPathInt:
* @xpath: the XPath string to evaluate
@@ -174,27 +142,6 @@ virXPathInt(const char *xpath,
}
-/**
- * virXPathLong:
- * @xpath: the XPath string to evaluate
- * @ctxt: an XPath context
- * @value: the returned long value
- *
- * Convenience function to evaluate an XPath number
- *
- * Returns 0 in case of success in which case @value is set,
- * or -1 if the XPath evaluation failed or -2 if the
- * value doesn't have a long format.
- */
-int
-virXPathLong(const char *xpath,
- xmlXPathContextPtr ctxt,
- long *value)
-{
- return virXPathLongBase(xpath, ctxt, 10, value);
-}
-
-
static int
virXPathULongBase(const char *xpath,
xmlXPathContextPtr ctxt,
diff --git a/src/util/virxml.h b/src/util/virxml.h
index bdd2e9145d..439a2a9991 100644
--- a/src/util/virxml.h
+++ b/src/util/virxml.h
@@ -60,10 +60,6 @@ virXPathUInt(const char *xpath,
xmlXPathContextPtr ctxt,
unsigned int *value);
int
-virXPathLong(const char *xpath,
- xmlXPathContextPtr ctxt,
- long *value);
-int
virXPathULong(const char *xpath,
xmlXPathContextPtr ctxt,
unsigned long *value);
--
2.37.3