[PHP-CVS] com php-src: Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases: Zend/zend_dtrace.c

2013-08-23 Thread Nikita Popov 
Commit:5ab6d215fca55a33b0f144c69afdcf9121d248eb
Author:Christopher Jones  Tue, 20 Aug 2013 16:32:53 
-0700
Committer: Nikita Popov   Fri, 23 Aug 2013 13:27:42 +0200
Parents:   7109f369e84838a852cd0f0c591fd58a1bc4
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=5ab6d215fca55a33b0f144c69afdcf9121d248eb

Log:
Remove duplicate calls to set filename & lineno for the 
DTRACE_FUNCTION_ENTRY/RETURN cases

Changed paths:
  M  Zend/zend_dtrace.c


Diff:
diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c
index 8846893..65c0193 100644
--- a/Zend/zend_dtrace.c
+++ b/Zend/zend_dtrace.c
@@ -58,10 +58,8 @@ ZEND_API void dtrace_execute(zend_op_array *op_array 
TSRMLS_DC)
}
 
if (DTRACE_FUNCTION_ENTRY_ENABLED() || 
DTRACE_FUNCTION_RETURN_ENABLED()) {
-   filename = dtrace_get_executed_filename(TSRMLS_C);
classname = get_active_class_name(&scope TSRMLS_CC);
funcname = get_active_function_name(TSRMLS_C);
-   lineno = zend_get_executed_lineno(TSRMLS_C);
}
 
if (DTRACE_EXECUTE_ENTRY_ENABLED()) {


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

[PHP-CVS] com php-src: Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases: Zend/zend_dtrace.c

2013-08-22 Thread Nikita Popov 
Commit:e212320a0c5e83385e26ec534dc72a16964cc67f
Author:Christopher Jones  Tue, 20 Aug 2013 16:32:53 
-0700
Committer: Nikita Popov   Thu, 22 Aug 2013 11:23:07 +0200
Parents:   4db494a3ab1de40990fc391636a14a241a2d7668
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e212320a0c5e83385e26ec534dc72a16964cc67f

Log:
Remove duplicate calls to set filename & lineno for the 
DTRACE_FUNCTION_ENTRY/RETURN cases

Changed paths:
  M  Zend/zend_dtrace.c


Diff:
diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c
index a07edd6..51bd1f4 100644
--- a/Zend/zend_dtrace.c
+++ b/Zend/zend_dtrace.c
@@ -58,10 +58,8 @@ ZEND_API void dtrace_execute_ex(zend_execute_data 
*execute_data TSRMLS_DC)
}
 
if (DTRACE_FUNCTION_ENTRY_ENABLED() || 
DTRACE_FUNCTION_RETURN_ENABLED()) {
-   filename = dtrace_get_executed_filename(TSRMLS_C);
classname = get_active_class_name(&scope TSRMLS_CC);
funcname = get_active_function_name(TSRMLS_C);
-   lineno = zend_get_executed_lineno(TSRMLS_C);
}
 
if (DTRACE_EXECUTE_ENTRY_ENABLED()) {


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