Merge ../mlt

[melted] / src / framework / mlt_tokeniser.c

diff --git a/src/framework/mlt_tokeniser.c b/src/framework/mlt_tokeniser.c
index 053b36f..1fa28b0 100644 (file)
--- 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 <charles.yates@pandora.be>
+/**
+ * \file mlt_tokeniser.c
+ * \brief string tokeniser
+ * \see mlt_tokeniser_s
+ *
+ * Copyright (C) 2002-2009 Ushodaya Enterprises Limited
+ * \author Charles Yates <charles.yates@pandora.be>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -74,7 +77,7 @@ static int mlt_tokeniser_append( mlt_tokeniser tokeniser, char *token )
 /** Parse a string by splitting on the delimiter provided.
 */
 
-int mlt_tokeniser_parse_new( mlt_tokeniser tokeniser, char *string, char *delimiter )
+int mlt_tokeniser_parse_new( mlt_tokeniser tokeniser, char *string, const char *delimiter )
 {
        int count = 0;
        int length = strlen( string );
@@ -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;
 }