virNodeDeviceCapVPDParseCustomFields: Don't use 'virXPathStringLimit'

virXPathStringLimit doesn't give callers a way to differentiate between
the queried XPath being empty and the length limit being exceeded.

This means that callers are overwriting the error message.

Move the length checks into the caller.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index ca534dfbed0d2a9ad978f9301dd99aebac5f47ca..0bac0fde8d346e79a84fdba8a686a70d25a582c3 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -955,7 +955,8 @@ virNodeDeviceCapVPDParseCustomFields(xmlXPathContextPtr ctxt, virPCIVPDResource
         g_autofree char *keyword = NULL;
 
         ctxt->node = nodes[i];
-        if (!(index = virXPathStringLimit("string(./@index[1])", 2, ctxt))) {
+        if (!(index = virXPathString("string(./@index[1])", ctxt)) ||
+            strlen(index) > 1) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
                     _("<vendor_field> evaluation has failed"));
             continue;
@@ -983,7 +984,8 @@ virNodeDeviceCapVPDParseCustomFields(xmlXPathContextPtr ctxt, virPCIVPDResource
             VIR_XPATH_NODE_AUTORESTORE(ctxt);
 
             ctxt->node = nodes[i];
-            if (!(index = virXPathStringLimit("string(./@index[1])", 2, ctxt))) {
+            if (!(index = virXPathString("string(./@index[1])", ctxt)) ||
+                strlen(index) > 1) {
                 virReportError(VIR_ERR_XML_ERROR, "%s",
                         _("<system_field> evaluation has failed"));
                 continue;