X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tokeniser.c;h=9f35376d3a04071353aac4572d81a312229b7a67;hb=93ba5329ea2cadd2ce01b4cceb20f1309fd37bed;hp=053b36f196f1dfeeab090ecffa30beaa399df7b1;hpb=a832a09ef6e1df77b9e3ed25b7a440d1dae4df8e;p=melted diff --git a/src/framework/mlt_tokeniser.c b/src/framework/mlt_tokeniser.c index 053b36f..9f35376 100644 --- a/src/framework/mlt_tokeniser.c +++ b/src/framework/mlt_tokeniser.c @@ -1,7 +1,10 @@ -/* - * mlt_tokeniser.c -- String tokeniser - * Copyright (C) 2002-2003 Ushodaya Enterprises Limited - * Author: Charles Yates +/** + * \file mlt_tokeniser.c + * \brief string tokeniser + * \see mlt_tokeniser_s + * + * Copyright (C) 2002-2009 Ushodaya Enterprises Limited + * \author Charles Yates * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -102,7 +105,7 @@ int mlt_tokeniser_parse_new( mlt_tokeniser tokeniser, char *string, char *delimi { strncat( token, start, end - start ); index += end - start; - if ( token[ 0 ] != '\"' || ( token[ 0 ] == '\"' && token[ strlen( token ) - 1 ] == '\"' ) ) + if ( strchr( token, '\"' ) == NULL || token[ strlen( token ) - 1 ] == '\"' ) { mlt_tokeniser_append( tokeniser, token ); strcpy( token, "" ); @@ -126,7 +129,7 @@ int mlt_tokeniser_parse_new( mlt_tokeniser tokeniser, char *string, char *delimi count = 0 - ( count - 1 ); mlt_tokeniser_append( tokeniser, token ); } - + free( token ); return count; }