[xdebug-dev] xdebug xdebug/xdebug.c xdebug/xdebug_handler_dbgp.c - Fixed typo in PHP 4 version of code.

Date: Wed Feb 2 00:33:16 CET 2005
User: Derick Rethans
Directory: xdebug

Log Message:
[0.25]
- Fixed typo in PHP 4 version of code.
#- Thy shall test before thy commith.

Modified files:
           xdebug/xdebug.c (version: 1.255)
           xdebug/xdebug_handler_dbgp.c (version: 1.69)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- xdebug/xdebug.c:1.254 Sat Jan 08 13:21:01 2005 GMT
+++ xdebug/xdebug.c Tue Feb 01 22:33:15 2005 GMT
@@ -895,6 +895,19 @@
         }
 
         while (i < j) {
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1
+ char *cv = NULL;
+ int cv_len;
+
+ if (op_array->opcodes[i].op1.op_type == IS_CV) {
+ cv = zend_get_compiled_variable_name(op_array, op_array->opcodes[i].op1.u.var, &cv_len);
+ xdebug_hash_update(fse->used_vars, cv, cv_len, xdstrdup(cv));
+ }
+ if (op_array->opcodes[i].op2.op_type == IS_CV) {
+ cv = zend_get_compiled_variable_name(op_array, op_array->opcodes[i].op2.u.var, &cv_len);
+ xdebug_hash_update(fse->used_vars, cv, cv_len, xdstrdup(cv));
+ }
+#else
                 if (op_array->opcodes[i].opcode == ZEND_FETCH_R || op_array->opcodes[i].opcode == ZEND_FETCH_W) {
                         if (op_array->opcodes[i].op1.op_type == IS_CONST) {
                                 if (Z_TYPE(op_array->opcodes[i].op1.u.constant) == IS_STRING) {
@@ -916,6 +929,7 @@
                                 }
                         }
                 }
+#endif
                 i++;
         }
 }

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- xdebug/xdebug_handler_dbgp.c:1.68 Tue Feb 01 21:53:44 2005 GMT
+++ xdebug/xdebug_handler_dbgp.c Tue Feb 01 22:33:15 2005 GMT
@@ -341,7 +341,7 @@
 {
 #if PHP_MAJOR_VERSION == 4
         zend_class_entry *ce;
- ce = Z_OBJCE_PP(arg);
+ ce = Z_OBJCE_P(z);
         *length = ce->name_length;
         return estrdup(ce->name);
 #endif
@@ -1887,7 +1887,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.68 $";
+ return "$Revision: 1.69 $";
 }
 
 int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
Received on Wed Feb 02 2005 - 00:33:28 GMT