Commit 06bcd20e authored by lefort's avatar lefort
Browse files

Merge branch 'main' into 2184-fix-evs-stereo-dmx-channel-disappearing

parents 0cacdb88 1961a83a
Loading
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -185,20 +185,21 @@ void convert_backslash(
void remove_cr(
    char *str )
{
    char *pos;
    int32_t n, p = 0;

    /* remove all \r characters from the string */
    pos = strchr( str, '\r' );
    while ( pos != NULL )
    for ( n = 0; str[n] != 0; n++ )
    {
        strcpy( pos, pos + 1 );
        pos = strchr( pos, '\r' );
        char c = str[n];
        str[p] = c;
        p += ( c == '\r' ) ? 0 : 1;
    }

    str[p] = 0;

    return;
}


/*---------------------------------------------------------------------*
 * clearString()
 *