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

cmDspClass.c : _cmDspParseArgV() now returns a va_list. This seems to

Browse Source 
now be required to work with the OSX 32bit build. Added missing va_end() in _cmDspClassErrV().
This commit is contained in:
kevin 2013-10-16 18:52:19 -07:00
parent b549a90da3
commit 75879e774a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dsp/cmDspClass.c
View File

@ -250,7 +250,7 @@ void* cmDspInstAllocate(
return p; return p;
} }
void _cmDspParseArgV( cmDspVarArg_t* a, va_list vl ) va_list _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
{ {
a->label = va_arg(vl,const char*); a->label = va_arg(vl,const char*);
a->constId = va_arg(vl,unsigned); a->constId = va_arg(vl,unsigned);
@ -258,6 +258,7 @@ void _cmDspParseArgV( cmDspVarArg_t* a, va_list vl )
a->cn = va_arg(vl,unsigned); a->cn = va_arg(vl,unsigned);
a->flags = va_arg(vl,unsigned); a->flags = va_arg(vl,unsigned);
a->doc = va_arg(vl,const char*); a->doc = va_arg(vl,const char*);
return vl;
} }
void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instByteCnt, unsigned instSymId, unsigned instId, unsigned storeSymId, unsigned va_cnt, va_list vl0, ... ) void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instByteCnt, unsigned instSymId, unsigned instId, unsigned storeSymId, unsigned va_cnt, va_list vl0, ... )
@ -278,16 +279,18 @@ void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instB
argCnt += repeatCnt; argCnt += repeatCnt;
_cmDspParseArgV(&a,vl1); vl1 = _cmDspParseArgV(&a,vl1);
} }
va_end(vl1);
cmDspVarArg_t aa[ argCnt+1 ]; cmDspVarArg_t aa[ argCnt+1 ];
unsigned j=0; unsigned j=0;
while( (repeatCnt = va_arg(vl2,int)) != 0 ) while( (repeatCnt = va_arg(vl2,int)) != 0 )
{ {
cmDspVarArg_t a; cmDspVarArg_t a;
_cmDspParseArgV(&a,vl2); vl2 = _cmDspParseArgV(&a,vl2);
cmDspArgSetupN(ctx,aa,argCnt,j,repeatCnt,a.label,a.constId,a.rn, a.cn, a.flags, a.doc ); cmDspArgSetupN(ctx,aa,argCnt,j,repeatCnt,a.label,a.constId,a.rn, a.cn, a.flags, a.doc );
j += repeatCnt; j += repeatCnt;
@ -295,7 +298,7 @@ void* cmDspInstAllocateV(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned instB
} }
cmDspArgSetupNull(aa + argCnt); cmDspArgSetupNull(aa + argCnt);
va_end(vl1); va_end(vl2);
return cmDspInstAllocate(ctx,classPtr,aa,instByteCnt,instSymId,instId,storeSymId,va_cnt,vl0); return cmDspInstAllocate(ctx,classPtr,aa,instByteCnt,instSymId,instId,storeSymId,va_cnt,vl0);
} }
@ -368,6 +371,7 @@ cmDspRC_t _cmDspClassErrV( cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned ins
else else
cmErrMsg( &classPtr->err, rc, "%s DSP Class:%s Inst:%i",buf, classPtr->labelStr,instId); cmErrMsg( &classPtr->err, rc, "%s DSP Class:%s Inst:%i",buf, classPtr->labelStr,instId);
va_end(vl2);
return rc; return rc;
} }