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

cmErr.c: Fix bug in use of va_list which showed up on spat-lab Mac port.

Browse Source
This commit is contained in:
kevin 2013-09-05 15:54:56 -07:00
parent 4e117d50a9
commit 73b2d853c8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmErr.c
View File

@ -17,6 +17,9 @@ void _cmErrVMsg(cmErr_t* err, bool warnFl, cmRC_t rc, const cmChar_t* fmt, va_li
{ {
if( err->rpt == NULL ) if( err->rpt == NULL )
return; return;
va_list vl0;
va_copy(vl0,vl);
const cmChar_t* hdrFmt = warnFl ? "%s warning: " : "%s error: "; const cmChar_t* hdrFmt = warnFl ? "%s warning: " : "%s error: ";
const cmChar_t* codeFmt = " (RC:%i)"; const cmChar_t* codeFmt = " (RC:%i)";
@ -26,11 +29,13 @@ void _cmErrVMsg(cmErr_t* err, bool warnFl, cmRC_t rc, const cmChar_t* fmt, va_li
int n2 = snprintf( NULL,0,codeFmt,rc); int n2 = snprintf( NULL,0,codeFmt,rc);
int n = n0+n1+n2+1; int n = n0+n1+n2+1;
cmChar_t s[n]; cmChar_t s[n];
n0 = snprintf(s,n,hdrFmt,cmStringNullGuard(err->label)); n0 = snprintf(s,n,hdrFmt,cmStringNullGuard(err->label));
n0 += vsnprintf(s+n0,n-n0,fmt,vl); n0 += vsnprintf(s+n0,n-n0,fmt,vl0);
n0 += snprintf(s+n0,n-n0,codeFmt,rc); n0 += snprintf(s+n0,n-n0,codeFmt,rc);
assert(n0 <= n ); assert(n0 <= n );
cmRptErrorf(err->rpt,"%s\n",s); cmRptErrorf(err->rpt,"%s\n",s);
va_end(vl0);
} }
void _cmErrMsg( cmErr_t* err, bool warnFl, cmRC_t rc, const cmChar_t* fmt, ... ) void _cmErrMsg( cmErr_t* err, bool warnFl, cmRC_t rc, const cmChar_t* fmt, ... )