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

cmStrStream.c : Completed initial tests and fixed bugs in cmOStrStreamWrite().

Browse Source
This commit is contained in:
kevin 2014-01-12 10:25:11 -05:00
parent e4c9f185b0
commit 7e27581f78
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmStrStream.c
View File

@ -24,6 +24,8 @@ typedef struct
cmSsBlk_t* elp; cmSsBlk_t* elp;
} cmOss_t; } cmOss_t;
cmStrStreamH_t cmStrStreamNullHandle = cmSTATIC_NULL_HANDLE;
cmOss_t* _cmOssHandleToPtr( cmStrStreamH_t h ) cmOss_t* _cmOssHandleToPtr( cmStrStreamH_t h )
{ {
cmOss_t* p = (cmOss_t*)h.h; cmOss_t* p = (cmOss_t*)h.h;
@ -90,8 +92,14 @@ bool cmOStrStreamIsValid( cmStrStreamH_t h )
cmSsRC_t cmOStrStreamWrite( cmStrStreamH_t h, const void* vp, unsigned byteCnt ) cmSsRC_t cmOStrStreamWrite( cmStrStreamH_t h, const void* vp, unsigned byteCnt )
{ {
cmSsRC_t rc = kOkSsRC; cmSsRC_t rc = kOkSsRC;
if( vp==NULL || byteCnt == 0 )
return rc;
cmOss_t* p = _cmOssHandleToPtr(h); cmOss_t* p = _cmOssHandleToPtr(h);
char* cp = (char*)vp; char* cp = (char*)vp;
unsigned j = 0;
do do
{ {
// if a blk exists // if a blk exists
@ -99,9 +107,10 @@ cmSsRC_t cmOStrStreamWrite( cmStrStreamH_t h, const void* vp, unsigned byteC
{ {
// copy as much of vp[] as possible into the current end block // copy as much of vp[] as possible into the current end block
unsigned n = cmMin(byteCnt, p->blkByteCnt - p->elp->i); unsigned n = cmMin(byteCnt, p->blkByteCnt - p->elp->i);
memcpy(p->elp->blk,cp,n); memcpy(p->elp->blk + p->elp->i,cp + j,n);
byteCnt -= n; byteCnt -= n;
p->elp->i += n; p->elp->i += n;
j += n;
} }
// if all of vp[] has been copied then we are done // if all of vp[] has been copied then we are done
@ -116,7 +125,7 @@ cmSsRC_t cmOStrStreamWrite( cmStrStreamH_t h, const void* vp, unsigned byteC
nbp->i = 0; nbp->i = 0;
nbp->link = NULL; nbp->link = NULL;
// end the new blk onto the end of the list // append the new blk onto the end of the list
if( p->elp == NULL ) if( p->elp == NULL )
p->blp = nbp; p->blp = nbp;
else else
@ -137,6 +146,9 @@ cmSsRC_t cmOStrStreamWriteStr( cmStrStreamH_t h, const cmChar_t* str )
return cmOStrStreamWrite(h,str,strlen(str)); return cmOStrStreamWrite(h,str,strlen(str));
} }
cmSsRC_t cmOStrStreamWriteStrN( cmStrStreamH_t h, const cmChar_t* str, unsigned n )
{ return cmOStrStreamWrite(h,str,n); }
cmSsRC_t cmOStrStreamVPrintf( cmStrStreamH_t h, const cmChar_t* fmt, va_list vl ) cmSsRC_t cmOStrStreamVPrintf( cmStrStreamH_t h, const cmChar_t* fmt, va_list vl )
{ {
cmChar_t* s = cmTsVPrintfP(NULL,fmt,vl); cmChar_t* s = cmTsVPrintfP(NULL,fmt,vl);