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

[Kalle Sommer Nielsen]

kalle                                    Thu, 23 Sep 2010 04:51:02 +0000

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

Log:
Eliminate a TSRMLS_FETCH() call in case of an error in one of the ereg functions

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

Modified: php/php-src/trunk/ext/ereg/ereg.c
===================================================================
--- php/php-src/trunk/ext/ereg/ereg.c   2010-09-23 04:50:26 UTC (rev 303710)
+++ php/php-src/trunk/ext/ereg/ereg.c   2010-09-23 04:51:02 UTC (rev 303711)
@@ -246,7 +246,7 @@
 /* {{{ php_ereg_eprint
  * php_ereg_eprint - convert error number to name
  */
-static void php_ereg_eprint(int err, regex_t *re) {
+static void php_ereg_eprint(int err, regex_t *re TSRMLS_DC) {
        char *buf = NULL, *message = NULL;
        size_t len;
        size_t buf_len;
@@ -265,8 +265,6 @@
 #endif
        len = regerror(err, re, NULL, 0);
        if (len) {
-               TSRMLS_FETCH();
-
                message = (char *)safe_emalloc((buf_len + len + 2), 
sizeof(char), 0);
                if (!message) {
                        return; /* fail silently */
@@ -330,7 +328,7 @@
        }

        if (err) {
-               php_ereg_eprint(err, &re);
+               php_ereg_eprint(err, &re TSRMLS_CC);
                RETURN_FALSE;
        }

@@ -343,7 +341,7 @@
        /* actually execute the regular expression */
        err = regexec(&re, string, re.re_nsub+1, subs, 0);
        if (err && err != REG_NOMATCH) {
-               php_ereg_eprint(err, &re);
+               php_ereg_eprint(err, &re TSRMLS_CC);
                regfree(&re);
                efree(subs);
                RETURN_FALSE;
@@ -426,7 +424,7 @@

        err = regcomp(&re, pattern, copts);
        if (err) {
-               php_ereg_eprint(err, &re);
+               php_ereg_eprint(err, &re TSRMLS_CC);
                return ((char *) -1);
        }

@@ -445,7 +443,7 @@
                err = regexec(&re, &string[pos], re.re_nsub+1, subs, (pos ? 
REG_NOTBOL : 0));

                if (err && err != REG_NOMATCH) {
-                       php_ereg_eprint(err, &re);
+                       php_ereg_eprint(err, &re TSRMLS_CC);
                        efree(subs);
                        efree(buf);
                        regfree(&re);
@@ -649,7 +647,7 @@

        err = regcomp(&re, spliton, REG_EXTENDED | copts);
        if (err) {
-               php_ereg_eprint(err, &re);
+               php_ereg_eprint(err, &re TSRMLS_CC);
                RETURN_FALSE;
        }

@@ -693,7 +691,7 @@

        /* see if we encountered an error */
        if (err && err != REG_NOMATCH) {
-               php_ereg_eprint(err, &re);
+               php_ereg_eprint(err, &re TSRMLS_CC);
                regfree(&re);
                zend_hash_destroy(Z_ARRVAL_P(return_value));
                efree(Z_ARRVAL_P(return_value));


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