From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 7 Dec 2013 14:42:17 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/krakjoe/phpdbg into opline_num_support
X-Git-Tag: php-5.6.0alpha1~110^2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=422f80e87d8ba32b270d723afa592c82256a22b5;p=php

Merge branch 'master' of https://github.com/krakjoe/phpdbg into opline_num_support

Conflicts:
	phpdbg.c
	phpdbg_bp.c
---

422f80e87d8ba32b270d723afa592c82256a22b5
diff --cc phpdbg_bp.c
index a84be3e378,3c0f198526..128c9c17f3
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@@ -926,12 -599,12 +926,12 @@@ static inline zend_bool phpdbg_find_bre
  				}
  			}
  		} break;
- 		
+ 
  		case FILE_PARAM: {
 -			if ((param->file.line == zend_get_executed_lineno(TSRMLS_C))) {
 +			if (param->file.line == zend_get_executed_lineno(TSRMLS_C)) {
  				const char *str = zend_get_executed_filename(TSRMLS_C);
  				size_t lengths[2] = {strlen(param->file.name), strlen(str)};
- 				
+ 
  				if (lengths[0] == lengths[1]) {
  					return (memcmp(
  						param->file.name, str, lengths[0]) == SUCCESS);
@@@ -965,14 -638,14 +965,14 @@@
  				}
  			}
  		} break;
- 		
+ 
  		case ADDR_PARAM: {
 -			return ((phpdbg_opline_ptr_t)execute_data->opline == param->addr);
 +			return ((zend_ulong)(phpdbg_opline_ptr_t)execute_data->opline == param->addr);
 +		} break;
 +		
 +		default: {
 +			/* do nothing */
  		} break;
 -
 -		case NUMERIC_PARAM:
 -		case EMPTY_PARAM: {
 -			/* do nothing */ } break;
  	}
  	return 0;
  } /* }}} */
@@@ -1588,12 -1120,11 +1602,12 @@@ PHPDBG_API void phpdbg_print_breakpoint
  						break;
  
  						default:
 -						break;
 +							phpdbg_error("Invalid parameter type for conditional breakpoint");
 +						return;
  					}
  				} else {
- 					phpdbg_writeln("#%d\t\tif %s%s",	
- 				 		brake->id, brake->code, 
+ 					phpdbg_writeln("#%d\t\tif %s%s",
+ 				 		brake->id, brake->code,
  				 		((phpdbg_breakbase_t*)brake)->disabled ? " [disabled]" : "");
  				}
  			}