haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ReadDelimitedText to return number of bytes consumed, not copied

This commit is contained in:
Dick Hollenbeck 2011-02-27 09:46:46 -06:00
parent d3c8084ab6
commit 38b69092f4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/string.cpp
View File

@ -13,10 +13,10 @@ int ReadDelimitedText( char* aDest, const char* aSource, int aDestSize )
if( aDestSize <= 0 ) if( aDestSize <= 0 )
return 0; return 0;
bool inside = false; bool inside = false;
char* start = aDest; const char* start = aSource;
char* limit = aDest + aDestSize - 1; char* limit = aDest + aDestSize - 1;
char cc; char cc;
while( (cc = *aSource++) != 0 && aDest < limit ) while( (cc = *aSource++) != 0 && aDest < limit )
{ {
@ -48,7 +48,7 @@ int ReadDelimitedText( char* aDest, const char* aSource, int aDestSize )
*aDest = 0; *aDest = 0;
return aDest - start; return aSource - start;
} }

3
include/kicad_string.h
View File

@ -24,7 +24,8 @@ char* strlower( char* Text );
* @param aDest is the destination byte buffer. * @param aDest is the destination byte buffer.
* @param aSource is the source bytes as a C string. * @param aSource is the source bytes as a C string.
* @param aDestSize is the size of the destination byte buffer. * @param aDestSize is the size of the destination byte buffer.
* @return int - the number of bytes extracted. * @return int - the number of bytes read from source, which may be more than
* the number copied, due to escaping of double quotes and the escape byte itself.
*/ */
int ReadDelimitedText( char* aDest, const char* aSource, int aDestSize ); int ReadDelimitedText( char* aDest, const char* aSource, int aDestSize );