]> granicus.if.org Git - php/commitdiff
Pssst, compiler!
authorBob Weinand <bobwei9@hotmail.com>
Sun, 8 Dec 2013 21:11:50 +0000 (22:11 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Sun, 8 Dec 2013 21:11:50 +0000 (22:11 +0100)
phpdbg_bp.c
phpdbg_cmd.c

index 3c0f198526757ca4aafddecfcd53993517654a9b..50580a5f5f1d791c61a91fd154ef016a7412e99d 100644 (file)
@@ -601,7 +601,7 @@ static inline zend_bool phpdbg_find_breakpoint_param(phpdbg_param_t *param, zend
                } 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)};
 
@@ -640,7 +640,7 @@ static inline zend_bool phpdbg_find_breakpoint_param(phpdbg_param_t *param, zend
                } 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;
 
                case NUMERIC_PARAM:
index 543c01c6f0fbf39c0bdd070c0c8649d442a212c6..d48624aa75f30ab8608ac0792cb86d90088dd655 100644 (file)
@@ -147,7 +147,7 @@ PHPDBG_API char* phpdbg_param_tostring(const phpdbg_param_t *param, char **point
                
                case FILE_PARAM:
                        asprintf(pointer,
-                               "%s:%u",
+                               "%s:%lu",
                                param->file.name,
                                param->file.line);
                break;