[xdebug-dev] xdebug xdebug/xdebug_handler_dbgp.c - fix windows build

Date: Wed Feb 2 23:23:20 CET 2005
User: Shane Caraveo
Directory: xdebug

Log Message:
[0.1]
- fix windows build

Modified files:
           xdebug/xdebug_handler_dbgp.c (version: 1.70)

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- xdebug/xdebug_handler_dbgp.c:1.69 Tue Feb 01 22:33:15 2005 GMT
+++ xdebug/xdebug_handler_dbgp.c Wed Feb 02 21:23:19 2005 GMT
@@ -335,6 +335,7 @@
                         return Z_OBJPROP_P(z);
                         break;
         }
+ return NULL;
 }
 
 inline static char *fetch_classname_from_zval(zval *z, int *length TSRMLS_DC)
@@ -381,7 +382,7 @@
                 int type = XF_ST_ROOT;
                 zval *retval = NULL;
                 char *current_classname = NULL;
- int cc_length;
+ int cc_length = 0;
 
                 /* Set the target table to the currently active scope */
                 st = XG(active_symbol_table);
@@ -403,7 +404,7 @@
                                                 if (*p[0] == '[') {
                                                         keyword_end = *p;
                                                         if (keyword) {
- retval = fetch_zval_from_symbol_table(st, keyword, keyword_end - keyword, type, current_classname, cc_length);
+ retval = fetch_zval_from_symbol_table(st, keyword, keyword_end - keyword, type, current_classname, cc_length TSRMLS_CC);
                                                                 current_classname = NULL;
                                                                 if (retval) {
                                                                         st = fetch_ht_from_zval(retval TSRMLS_CC);
@@ -415,7 +416,7 @@
                                                 } else if (*p[0] == '-') {
                                                         keyword_end = *p;
                                                         if (keyword) {
- retval = fetch_zval_from_symbol_table(st, keyword, keyword_end - keyword, type, current_classname, cc_length);
+ retval = fetch_zval_from_symbol_table(st, keyword, keyword_end - keyword, type, current_classname, cc_length TSRMLS_CC);
                                                                 current_classname = fetch_classname_from_zval(retval, &cc_length TSRMLS_CC);
                                                                 if (retval) {
                                                                         st = fetch_ht_from_zval(retval TSRMLS_CC);
@@ -442,7 +443,7 @@
                                                 if (*p[0] == '\'') {
                                                         state = 5;
                                                         keyword_end = *p;
- retval = fetch_zval_from_symbol_table(st, keyword, keyword_end - keyword, type, current_classname, cc_length);
+ retval = fetch_zval_from_symbol_table(st, keyword, keyword_end - keyword, type, current_classname, cc_length TSRMLS_CC);
                                                         current_classname = NULL;
                                                         if (retval) {
                                                                 st = fetch_ht_from_zval(retval TSRMLS_CC);
@@ -460,7 +461,7 @@
                         }
                 } while (found < 0);
                 if (keyword != NULL) {
- retval = fetch_zval_from_symbol_table(st, keyword, *p - keyword, type, current_classname, cc_length);
+ retval = fetch_zval_from_symbol_table(st, keyword, *p - keyword, type, current_classname, cc_length TSRMLS_CC);
                         if (retval) {
                                 st = fetch_ht_from_zval(retval TSRMLS_CC);
                         }
@@ -1395,7 +1396,10 @@
 
 DBGP_FUNC(property_get)
 {
+ xdebug_dbgp_options *options = (xdebug_dbgp_options*) XG(context).options;
         int depth = -1;
+ int page = -1;
+ int max_data = options->max_data;
         function_stack_entry *fse;
 
         if (!CMD_OPTION('n')) {
@@ -1405,6 +1409,9 @@
         if (CMD_OPTION('d')) {
                 depth = strtol(CMD_OPTION('d'), NULL, 10);
         }
+ if (CMD_OPTION('p')) {
+ page = strtol(CMD_OPTION('p'), NULL, 10);
+ }
         /* Set the symbol table corresponding with the requested stack depth */
         if (depth == -1) {
                 XG(active_symbol_table) = EG(active_symbol_table);
@@ -1887,7 +1894,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.69 $";
+ return "$Revision: 1.70 $";
 }
 
 int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
Received on Wed Feb 02 2005 - 23:23:33 GMT