version 1.140.2.1, 2009/02/09 11:35:00
|
version 1.142.2.1, 2009/09/09 13:16:14
|
|
|
XmlEntry& entry, | XmlEntry& entry, |
const char* tagName) | const char* tagName) |
{ | { |
if (!parser.next(entry) || |
if (!parser.next(entry)) |
(entry.type != XmlEntry::START_TAG && |
{ |
|
return false; |
|
} |
|
if ((entry.type != XmlEntry::START_TAG && |
entry.type != XmlEntry::EMPTY_TAG) || | entry.type != XmlEntry::EMPTY_TAG) || |
strcmp(entry.text, tagName) != 0) | strcmp(entry.text, tagName) != 0) |
{ | { |
|
|
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// stringToSignedInteger |
|
// |
|
// [ "+" | "-" ] ( positiveDecimalDigit *decimalDigit | "0" ) |
|
// or |
|
// [ "+" | "-" ] ( "0x" | "0X" ) 1*hexDigit |
|
// |
|
//------------------------------------------------------------------------------ |
|
|
|
Boolean XmlReader::stringToSignedInteger( |
|
const char* stringValue, |
|
Sint64& x) |
|
{ |
|
return (StringConversion::stringToSint64( |
|
stringValue, StringConversion::decimalStringToUint64, x) || |
|
StringConversion::stringToSint64( |
|
stringValue, StringConversion::hexStringToUint64, x)); |
|
} |
|
|
|
//------------------------------------------------------------------------------ |
|
// |
|
// stringToUnsignedInteger |
|
// |
|
// ( positiveDecimalDigit *decimalDigit | "0" ) |
|
// or |
|
// ( "0x" | "0X" ) 1*hexDigit |
|
// |
|
//------------------------------------------------------------------------------ |
|
|
|
Boolean XmlReader::stringToUnsignedInteger( |
|
const char* stringValue, |
|
Uint64& x) |
|
{ |
|
return (StringConversion::decimalStringToUint64(stringValue, x) || |
|
StringConversion::hexStringToUint64(stringValue, x)); |
|
} |
|
|
|
//------------------------------------------------------------------------------ |
|
// |
|
// stringToValue() | // stringToValue() |
// | // |
// Return: CIMValue. If the string input is zero length creates a CIMValue | // Return: CIMValue. If the string input is zero length creates a CIMValue |
|
|
{ | { |
Uint64 x; | Uint64 x; |
| |
if (!stringToUnsignedInteger(valueString, x)) |
if (!StringConversion::stringToUnsignedInteger(valueString, x)) |
{ | { |
MessageLoaderParms mlParms( | MessageLoaderParms mlParms( |
"Common.XmlReader.INVALID_UI_VALUE", | "Common.XmlReader.INVALID_UI_VALUE", |
|
|
{ | { |
Sint64 x; | Sint64 x; |
| |
if (!stringToSignedInteger(valueString, x)) |
if (!StringConversion::stringToSignedInteger(valueString, x)) |
{ | { |
MessageLoaderParms mlParms( | MessageLoaderParms mlParms( |
"Common.XmlReader.INVALID_SI_VALUE", | "Common.XmlReader.INVALID_SI_VALUE", |
|
|
| |
Uint64 arraySize; | Uint64 arraySize; |
| |
if (!stringToUnsignedInteger(tmp, arraySize) || (arraySize == 0) || |
if (!StringConversion::stringToUnsignedInteger(tmp, arraySize) || |
|
(arraySize == 0) || |
!StringConversion::checkUintBounds(arraySize, CIMTYPE_UINT32)) | !StringConversion::checkUintBounds(arraySize, CIMTYPE_UINT32)) |
{ | { |
char message[128]; | char message[128]; |