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

cmDspSys.h/c: Completed and tested cmDspRsrcWriteString().

Browse Source
This commit is contained in:
kevin 2013-05-23 14:09:47 -07:00
parent f1dc68364a
commit 778e95cb1f
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dsp/cmDspSys.c
View File

@ -1870,8 +1870,12 @@ cmDspRC_t _cmDspRsrcWritePath( cmDspSysH_t h, cmChar_t** pathStrRef, cmChar_t**
break; break;
if( prevStr != NULL ) if( prevStr != NULL )
path = cmTextAppendSS(path,"/"); {
path = cmTextAppendSS(path,prevStr); if( path != NULL )
path = cmTextAppendSS(path,"/");
path = cmTextAppendSS(path,prevStr);
}
prevStr = str; prevStr = str;
} }
@ -2333,21 +2337,42 @@ cmDspRC_t cmDspRsrcStringArray( cmDspSysH_t h, unsigned* np, const cmChar_t*** v
return rc; return rc;
} }
cmDspRC_t _cmDspWritePathAndParent( cmDspSysH_t h, cmChar_t** pathRef, cmChar_t** varLabelRef, cmJsonNode_t** parentRef, va_list vl )
{
cmDsp_t* p = _cmDspHandleToPtr(h);
cmJsonH_t jsH = cmDspSysPgmRsrcHandle(h);
cmDspRC_t rc;
if((rc = _cmDspRsrcWritePath(h,pathRef,varLabelRef,vl)) != kOkDspRC )
goto errLabel;
if( *pathRef == NULL )
*parentRef = cmJsonRoot(jsH);
else
*parentRef = cmJsonFindPathValue( jsH, *pathRef, cmJsonRoot(jsH), kPairTId );
if( *parentRef == NULL )
{
rc = cmErrMsg(&p->err,kJsonFailDspRC,"The parent object '%s' for variable '%s' could not be found.",cmStringNullGuard(*pathRef),cmStringNullGuard(*varLabelRef));
goto errLabel;
}
errLabel:
return rc;
}
cmDspRC_t cmDspRsrcWriteStringV( cmDspSysH_t h, const cmChar_t* v, va_list vl ) cmDspRC_t cmDspRsrcWriteStringV( cmDspSysH_t h, const cmChar_t* v, va_list vl )
{ {
cmDsp_t* p = _cmDspHandleToPtr(h); cmDsp_t* p = _cmDspHandleToPtr(h);
cmChar_t* pathStr = NULL;
cmChar_t* varStr = NULL;
cmJsonH_t jsH = cmDspSysPgmRsrcHandle(h); cmJsonH_t jsH = cmDspSysPgmRsrcHandle(h);
cmChar_t* varStr = NULL;
cmChar_t* pathStr = NULL;
cmJsonNode_t* parentObjNodePtr = NULL; cmJsonNode_t* parentObjNodePtr = NULL;
cmDspRC_t rc; cmDspRC_t rc;
if((rc = _cmDspRsrcWritePath(h,&pathStr,&varStr,vl)) != kOkDspRC ) if((rc = _cmDspWritePathAndParent(h, &pathStr, &varStr, &parentObjNodePtr, vl )) != kOkDspRC )
goto errLabel; goto errLabel;
if((parentObjNodePtr = cmJsonFindPathValue( jsH, pathStr, cmJsonRoot(jsH), kPairTId )) == NULL )
rc = cmErrMsg(&p->err,kJsonFailDspRC,"The parent object '%s' for variable '%s' could not be found.",cmStringNullGuard(pathStr),cmStringNullGuard(varStr));
if( cmJsonInsertOrReplacePairString( jsH, parentObjNodePtr, varStr, kStringTId, v ) != kOkJsRC ) if( cmJsonInsertOrReplacePairString( jsH, parentObjNodePtr, varStr, kStringTId, v ) != kOkJsRC )
rc = cmErrMsg(&p->err,kJsonFailDspRC,"Write 'string' resource value failed for path '%s' and variable '%s'",cmStringNullGuard(pathStr),cmStringNullGuard(varStr)); rc = cmErrMsg(&p->err,kJsonFailDspRC,"Write 'string' resource value failed for path '%s' and variable '%s'",cmStringNullGuard(pathStr),cmStringNullGuard(varStr));

1
dsp/cmDspSys.h
View File

@ -268,6 +268,7 @@ extern "C" {
cmDspRC_t cmDspRsrcWriteStringV( cmDspSysH_t h, const cmChar_t* v, va_list vl ); cmDspRC_t cmDspRsrcWriteStringV( cmDspSysH_t h, const cmChar_t* v, va_list vl );
cmDspRC_t cmDspRsrcWriteString( cmDspSysH_t h, const cmChar_t* v, ... ); cmDspRC_t cmDspRsrcWriteString( cmDspSysH_t h, const cmChar_t* v, ... );