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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index dab3b389c8d08a30bd19be37ac18f996d047184e..0fc5481a26f9b38d26061b3a20aaea758e21357e 100644 (file)
--- 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 d80a69f1639b6f3c40285156d3ee97c1b1ab36bb..f5ee9284a675e84e8c19f394d56b6fb19de39558 100644 (file)
--- 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 bdd2e9145d4a596852574efd469a864938324cc4..439a2a999156fbe5e8c2c4129168bbdb810c0f64 100644 (file)
--- 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);