External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 14:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: xml: Remove unused virXPathULong*

Browse Source 
Remove the now-unused functions for parsing 'unsigned long' values via
XPath.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-10-05 17:26:51 +02:00
parent 111a21c21f
commit 45029ffa54
3 changed files with 0 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt_private.syms
View File

@ -3699,8 +3699,6 @@ virXPathNodeSet;
virXPathString; virXPathString;
virXPathUInt; virXPathUInt;
virXPathUIntBase; virXPathUIntBase;
virXPathULong;
virXPathULongHex;
virXPathULongLong; virXPathULongLong;
virXPathULongLongBase; virXPathULongLongBase;

75
src/util/virxml.c
View File

@ -142,38 +142,6 @@ virXPathInt(const char *xpath,
} }
static int
virXPathULongBase(const char *xpath,
xmlXPathContextPtr ctxt,
int base,
unsigned 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 virXPathULong()"));
return -1;
}
obj = xmlXPathEval(BAD_CAST xpath, ctxt);
if ((obj != NULL) && (obj->type == XPATH_STRING) &&
(obj->stringval != NULL) && (obj->stringval[0] != 0)) {
if (virStrToLong_ul((char *) obj->stringval, NULL, base, value) < 0)
ret = -2;
} else if ((obj != NULL) && (obj->type == XPATH_NUMBER) &&
(!(isnan(obj->floatval)))) {
*value = (unsigned long) obj->floatval;
if (*value != obj->floatval)
ret = -2;
} else {
ret = -1;
}
return ret;
}
/** /**
* virXPathUIntBase: * virXPathUIntBase:
* @xpath: the XPath string to evaluate * @xpath: the XPath string to evaluate
@ -216,49 +184,6 @@ virXPathUInt(const char *xpath,
} }
/**
* virXPathULong:
* @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
virXPathULong(const char *xpath,
xmlXPathContextPtr ctxt,
unsigned long *value)
{
return virXPathULongBase(xpath, ctxt, 10, value);
}
/**
* virXPathUHex:
* @xpath: the XPath string to evaluate
* @ctxt: an XPath context
* @value: the returned long value
*
* Convenience function to evaluate an XPath number
* according to base of 16
*
* 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
virXPathULongHex(const char *xpath,
xmlXPathContextPtr ctxt,
unsigned long *value)
{
return virXPathULongBase(xpath, ctxt, 16, value);
}
/** /**
* virXPathULongLongBase: * virXPathULongLongBase:
* @xpath: the XPath string to evaluate * @xpath: the XPath string to evaluate

8
src/util/virxml.h
View File

@ -60,10 +60,6 @@ virXPathUInt(const char *xpath,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
unsigned int *value); unsigned int *value);
int int
virXPathULong(const char *xpath,
xmlXPathContextPtr ctxt,
unsigned long *value);
int
virXPathULongLongBase(const char *xpath, virXPathULongLongBase(const char *xpath,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
unsigned int base, unsigned int base,
@ -76,10 +72,6 @@ int
virXPathLongLong(const char *xpath, virXPathLongLong(const char *xpath,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
long long *value); long long *value);
int
virXPathULongHex(const char *xpath,
xmlXPathContextPtr ctxt,
unsigned long *value);
xmlNodePtr xmlNodePtr
virXPathNode(const char *xpath, virXPathNode(const char *xpath,
xmlXPathContextPtr ctxt); xmlXPathContextPtr ctxt);