[PHP-CVS] svn: /php/php-src/trunk/ext/tokenizer/ tokenizer.c

[Johannes Schlüter]

johannes                                 Sun, 30 May 2010 09:34:02 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=299963

Log:
- token_get_all now returns false on error, not "", returns array on success

Changed paths:
    U   php/php-src/trunk/ext/tokenizer/tokenizer.c

Modified: php/php-src/trunk/ext/tokenizer/tokenizer.c
===================================================================
--- php/php-src/trunk/ext/tokenizer/tokenizer.c 2010-05-30 09:14:04 UTC (rev 
299962)
+++ php/php-src/trunk/ext/tokenizer/tokenizer.c 2010-05-30 09:34:02 UTC (rev 
299963)
@@ -164,15 +164,16 @@
        zval source_z;
        zend_lex_state original_lex_state;

-       if (zend_parse_parameters(argc TSRMLS_CC, "s", &source, &source_len) == 
FAILURE)
+       if (zend_parse_parameters(argc TSRMLS_CC, "s", &source, &source_len) == 
FAILURE) {
                return;
+       }

        ZVAL_STRINGL(&source_z, source, source_len, 1);
        zend_save_lexical_state(&original_lex_state TSRMLS_CC);

        if (zend_prepare_string_for_scanning(&source_z, "" TSRMLS_CC) == 
FAILURE) {
                zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
-               RETURN_EMPTY_STRING();
+               RETURN_FALSE;
        }

        LANG_SCNG(yy_state) = yycINITIAL;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php