From: krakjoe <joe.watkins@live.co.uk>
Date: Thu, 14 Nov 2013 16:03:40 +0000 (+0000)
Subject: ...
X-Git-Tag: php-5.6.0alpha1~110^2~334
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4de11a2b42b41daf09413dd96c44de4b5a22930;p=php

...
---

diff --git a/phpdbg_break.c b/phpdbg_break.c
index a5346747d0..66f973fd0b 100644
--- a/phpdbg_break.c
+++ b/phpdbg_break.c
@@ -29,8 +29,9 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
 PHPDBG_BREAK(file) /* {{{ */
 {
 	phpdbg_param_t param;
-
-	switch (phpdbg_parse_param(expr, expr_len, &param TSRMLS_CC)) {
+    int type;
+    
+	switch ((type=phpdbg_parse_param(expr, expr_len, &param TSRMLS_CC))) {
 		case EMPTY_PARAM:
 			phpdbg_error("No expression provided");
 			break;
@@ -42,7 +43,7 @@ PHPDBG_BREAK(file) /* {{{ */
 			break;
 	}
 
-	phpdbg_clear_param(&param);
+	phpdbg_clear_param(type, &param TSRMLS_CC);
 
 	return SUCCESS;
 } /* }}} */
@@ -50,8 +51,9 @@ PHPDBG_BREAK(file) /* {{{ */
 PHPDBG_BREAK(method) /* {{{ */
 {
 	phpdbg_param_t param;
-
-	switch (phpdbg_parse_param(expr, expr_len, &param TSRMLS_CC)) {
+    int type;
+    
+	switch ((type=phpdbg_parse_param(expr, expr_len, &param TSRMLS_CC))) {
 		case EMPTY_PARAM:
 			phpdbg_error("No expression provided");
 			break;
@@ -63,7 +65,7 @@ PHPDBG_BREAK(method) /* {{{ */
 			break;
     }
 
-    phpdbg_clear_param(&param);
+    phpdbg_clear_param(type, &param TSRMLS_CC);
 
     return SUCCESS;
 } /* }}} */
@@ -71,8 +73,9 @@ PHPDBG_BREAK(method) /* {{{ */
 PHPDBG_BREAK(address) /* {{{ */
 {
 	phpdbg_param_t param;
-
-	switch (phpdbg_parse_param(expr, expr_len, &param TSRMLS_CC)) {
+    int type;
+    
+	switch ((type=phpdbg_parse_param(expr, expr_len, &param TSRMLS_CC))) {
 		case EMPTY_PARAM:
 			phpdbg_error("No expression provided");
 			break;
@@ -84,7 +87,7 @@ PHPDBG_BREAK(address) /* {{{ */
 			break;
     }
 
-    phpdbg_clear_param(&param);
+    phpdbg_clear_param(type, &param TSRMLS_CC);
 
     return SUCCESS;
 } /* }}} */
@@ -102,13 +105,14 @@ PHPDBG_BREAK(on) /* {{{ */
 PHPDBG_BREAK(lineno) /* {{{ */
 {
 	phpdbg_param_t param;
-
+    int type;
+    
 	if (!PHPDBG_G(exec)) {
 		phpdbg_error("Not file context found!");
 		return SUCCESS;
 	}
 
-	switch (phpdbg_parse_param(expr, expr_len, &param TSRMLS_CC)) {
+	switch ((type=phpdbg_parse_param(expr, expr_len, &param TSRMLS_CC))) {
 		case EMPTY_PARAM:
 			phpdbg_error("No expression provided!");
 			break;
@@ -120,7 +124,7 @@ PHPDBG_BREAK(lineno) /* {{{ */
 			break;
 	}
 
-	phpdbg_clear_param(&param);
+	phpdbg_clear_param(type, &param TSRMLS_CC);
 
 	return SUCCESS;
 } /* }}} */
@@ -128,8 +132,9 @@ PHPDBG_BREAK(lineno) /* {{{ */
 PHPDBG_BREAK(func) /* {{{ */
 {
 	phpdbg_param_t param;
-
-	switch (phpdbg_parse_param(expr, expr_len, &param TSRMLS_CC)) {
+    int type;
+    
+	switch ((type=phpdbg_parse_param(expr, expr_len, &param TSRMLS_CC))) {
 		case EMPTY_PARAM:
 			phpdbg_error("No expression provided!");
 			break;
@@ -141,7 +146,7 @@ PHPDBG_BREAK(func) /* {{{ */
 			break;
 	}
 
-	phpdbg_clear_param(&param);
+	phpdbg_clear_param(type, &param TSRMLS_CC);
 
     return SUCCESS;
 } /* }}} */