Commit 38b69092 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

ReadDelimitedText to return number of bytes consumed, not copied

parent d3c8084a

common/string.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ int ReadDelimitedText( char* aDest, const char* aSource, int aDestSize ) 
        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;
@@ -48,7 +48,7 @@ int ReadDelimitedText( char* aDest, const char* aSource, int aDestSize ) 




    *aDest = 0;

    *aDest = 0;





    return aDest - start;

    return aSource - start;

}

}

include/kicad_string.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -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 );