cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmXml.h/c : Added cmXmlNodeDouble() and cmXmlHasChild().

Browse Source
This commit is contained in:
kevin 2016-02-04 17:55:40 -05:00
parent 3babaf428a
commit 538996549b
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cmXml.c
View File

@ -944,6 +944,23 @@ cmXmlRC_t cmXmlNodeIntV(const cmXmlNode_t* np, int* retRef, va_list vl
cmXmlRC_t cmXmlNodeUIntV(const cmXmlNode_t* np, unsigned* retRef, va_list vl ) cmXmlRC_t cmXmlNodeUIntV(const cmXmlNode_t* np, unsigned* retRef, va_list vl )
{ return cmXmlNodeIntV(np,(int*)retRef,vl); } { return cmXmlNodeIntV(np,(int*)retRef,vl); }
cmXmlRC_t cmXmlNodeDoubleV(const cmXmlNode_t* np, double* retRef, va_list vl )
{
const cmChar_t* valueStr;
if((valueStr = cmXmlNodeValueV(np,vl)) == NULL )
return kNodeNotFoundXmlRC;
errno = 0;
// convert the string to a double
*retRef = strtod(valueStr,NULL);
if( errno != 0 )
return kInvalidTypeXmlRC;
return kOkXmlRC;
}
cmXmlRC_t cmXmlNodeInt( const cmXmlNode_t* np, int* retRef, ... ) cmXmlRC_t cmXmlNodeInt( const cmXmlNode_t* np, int* retRef, ... )
{ {
cmXmlRC_t rc; cmXmlRC_t rc;
@ -964,6 +981,28 @@ cmXmlRC_t cmXmlNodeUInt( const cmXmlNode_t* np, unsigned* retRef, ... )
return rc; return rc;
} }
cmXmlRC_t cmXmlNodeDouble(const cmXmlNode_t* np, double* retRef, ...)
{
cmXmlRC_t rc;
va_list vl;
va_start(vl,retRef);
rc = cmXmlNodeDoubleV(np,retRef,vl);
va_end(vl);
return rc;
}
bool cmXmlNodeHasChild( const cmXmlNode_t* np, const cmChar_t* label )
{
const cmXmlNode_t* cnp = np->children;
for(; cnp!=NULL; cnp=cnp->sibling)
if( cmTextCmp(cnp->label,label) == 0 )
return true;
return false;
}
cmXmlRC_t _cmXmlPrintScore( cmXmlH_t h ) cmXmlRC_t _cmXmlPrintScore( cmXmlH_t h )
{ {

13
cmXml.h
View File

@ -73,11 +73,16 @@ extern "C" {
const cmChar_t* cmXmlNodeValueV( const cmXmlNode_t* np, va_list vl ); const cmChar_t* cmXmlNodeValueV( const cmXmlNode_t* np, va_list vl );
const cmChar_t* cmXmlNodeValue( const cmXmlNode_t* np, ... ); const cmChar_t* cmXmlNodeValue( const cmXmlNode_t* np, ... );
cmXmlRC_t cmXmlNodeIntV( const cmXmlNode_t* np, int* retRef, va_list vl ); cmXmlRC_t cmXmlNodeIntV( const cmXmlNode_t* np, int* retRef, va_list vl );
cmXmlRC_t cmXmlNodeUIntV(const cmXmlNode_t* np, unsigned* retRef, va_list vl ); cmXmlRC_t cmXmlNodeUIntV( const cmXmlNode_t* np, unsigned* retRef, va_list vl );
cmXmlRC_t cmXmlNodeDoubleV( const cmXmlNode_t* np, double* retRef, va_list vl );
cmXmlRC_t cmXmlNodeInt( const cmXmlNode_t* np, int* retRef, ... );
cmXmlRC_t cmXmlNodeUInt( const cmXmlNode_t* np, unsigned* retRef, ... );
cmXmlRC_t cmXmlNodeDouble(const cmXmlNode_t* np, double* retRef, ...);
bool cmXmlNodeHasChild( const cmXmlNode_t* np, const cmChar_t* label );
cmXmlRC_t cmXmlNodeInt( const cmXmlNode_t* np, int* retRef, ... );
cmXmlRC_t cmXmlNodeUInt( const cmXmlNode_t* np, unsigned* retRef, ... );
cmXmlRC_t cmXmlTest( cmCtx_t* ctx, const cmChar_t* fn ); cmXmlRC_t cmXmlTest( cmCtx_t* ctx, const cmChar_t* fn );