Date: Thu Apr 22 20:37:43 CEST 2004
User: Derick Rethans
Directory: xdebug
Log Message:
[0.25]
- Whitespace and removing some unused variables.
Modified files:
xdebug/xdebug.c (version: 1.214)
xdebug/xdebug_handler_dbgp.c (version: 1.42)
xdebug/xdebug_handler_dbgp.h (version: 1.12)
[FILE: /xdebug/xdebug.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- xdebug/xdebug.c:1.213 Wed Apr 21 16:30:28 2004 GMT
+++ xdebug/xdebug.c Thu Apr 22 16:37:43 2004 GMT
@@ -1300,7 +1300,7 @@
/* Get handler from mode */
XG(context).handler = xdebug_handler_get(XG(remote_handler));
- XG(context).handler->remote_init(&(XG(context)), XDEBUG_JIT, NULL);
+ XG(context).handler->remote_init(&(XG(context)), XDEBUG_JIT);
}
}
if (XG(remote_enabled)) {
[FILE: /xdebug/xdebug_handler_dbgp.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xdebug/xdebug_handler_dbgp.c:1.41 Wed Apr 21 16:19:31 2004 GMT
+++ xdebug/xdebug_handler_dbgp.c Thu Apr 22 16:37:43 2004 GMT
@@ -234,7 +234,7 @@
return *retval;
}
}
-
+
st = &EG(symbol_table);
if (zend_hash_find(st, name, name_length, (void **) &retval) == SUCCESS) {
return *retval;
@@ -555,7 +555,7 @@
if (action == BREAKPOINT_ACTION_UPDATE) {
if (CMD_OPTION('s')) {
BREAKPOINT_CHANGE_STATE();
- }
+ }
if (CMD_OPTION('n')) {
brk_info->lineno = strtol(CMD_OPTION('n'), NULL, 10);
}
@@ -777,7 +777,7 @@
xdebug_xml_node *message;
int new_len;
char *encoded_source;
-
+
message = xdebug_xml_node_init("stream");
xdebug_xml_add_attribute_ex(message, "type", (char *)name, 0, 0);
xdebug_xml_add_attribute_ex(message, "encoding", "base64", 0, 0);
@@ -785,7 +785,7 @@
xdebug_xml_add_text(message, xdstrdup(encoded_source));
send_message(&XG(context), message);
xdebug_xml_node_dtor(message);
-
+
efree(encoded_source);
return 0;
}
@@ -1114,12 +1114,10 @@
DBGP_FUNC(property_set)
{
- xdebug_xml_node *var_data;
int depth = 0;
int context_id = 0;
char *new_value;
char *eval_string;
- xdebug_xml_node *ret_xml;
zval ret_zval;
int new_length;
int res;
@@ -1129,14 +1127,14 @@
char *data = CMD_OPTION('-');
/* XXX TODO
- if the key or the address are returned, they can be used to more efficiently
- retrieve the value from the variables list. Otherwise we use EVAL to set
- the property which works great, but is slower.
-
- handle the depth value and set the property at a specific stack depth
-
- handle the context_id value and set the property in the correct context
- */
+ * if the key or the address are returned, they can be used to more
+ * efficiently retrieve the value from the variables list. Otherwise we
+ * use EVAL to set the property which works great, but is slower.
+ *
+ * handle the depth value and set the property at a specific stack depth
+ *
+ * handle the context_id value and set the property in the correct context
+ */
if (!name) { /* name */
RETURN_RESULT(XG(status), XG(reason), XDEBUG_ERROR_INVALID_ARGS);
@@ -1153,13 +1151,12 @@
if (CMD_OPTION('a')) { /* address */
address = strtol(CMD_OPTION('a'), NULL, 10);
}
-
+
/* base64 decode eval string */
new_value = xdebug_base64_decode(data, strlen(data), &new_length);
eval_string = xdebug_sprintf("%s = %s", name, new_value);
res = _xdebug_do_eval(eval_string, &ret_zval TSRMLS_CC);
-
efree(new_value);
xdfree(eval_string);
/* Handle result */
@@ -1168,11 +1165,6 @@
xdebug_xml_add_attribute(*retval, "success", "0");
} else {
xdebug_xml_add_attribute(*retval, "success", "1");
- /*
- It is not spec to return the property element
- ret_xml = get_zval_value_xml_node(name, &ret_zval);
- xdebug_xml_add_child(*retval, ret_xml);
- */
zval_dtor(&ret_zval);
}
}
@@ -1182,13 +1174,14 @@
zval *var_data;
zval ret_zval;
int res;
- xdebug_xml_node *ret_xml;
char *name = CMD_OPTION('n');
+ long context_id = 0, depth = 0;
/* XXX TODO
- handle the depth value and set the property at a specific stack depth
-
- handle the context_id value and set the property in the correct context
+ * handle the depth value and set the property at a specific stack depth
+ *
+ * handle the context_id value and set the property in the correct context
+ */
if (CMD_OPTION('d')) {
depth = strtol(CMD_OPTION('d'), NULL, 10);
@@ -1196,7 +1189,6 @@
if (CMD_OPTION('c')) {
context_id = strtol(CMD_OPTION('c'), NULL, 10);
}
- */
if (!name) {
RETURN_RESULT(XG(status), XG(reason), XDEBUG_ERROR_INVALID_ARGS);
@@ -1536,7 +1528,7 @@
char *xdebug_dbgp_get_revision(void)
{
- return "$Revision: 1.41 $";
+ return "$Revision: 1.42 $";
}
int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
@@ -1611,7 +1603,7 @@
if (getenv("DBGP_COOKIE")) {
xdebug_xml_add_attribute_ex(response, "session", xdstrdup(getenv("DBGP_COOKIE")), 0, 1);
- }
+ }
context->buffer = xdmalloc(sizeof(fd_buf));
context->buffer->buffer = NULL;
@@ -1672,7 +1664,7 @@
XG(stdio).php_body_write = NULL;
XG(stdio).php_header_write = NULL;
}
-
+
xdfree(context->options);
xdebug_hash_destroy(context->function_breakpoints);
xdebug_hash_destroy(context->class_breakpoints);
[FILE: /xdebug/xdebug_handler_dbgp.h]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xdebug/xdebug_handler_dbgp.h:1.11 Wed Apr 21 16:19:31 2004 GMT
+++ xdebug/xdebug_handler_dbgp.h Thu Apr 22 16:37:43 2004 GMT
@@ -71,7 +71,7 @@
int cont;
} xdebug_dbgp_cmd;
-#define CMD_OPTION(opt) (opt == '-'?args->value[26]:args->value[(opt) - 'a'])
+#define CMD_OPTION(opt) (opt == '-' ? args->value[26] : args->value[(opt) - 'a'])
typedef struct xdebug_dbgp_options {
int max_children;
Received on Thu Apr 22 2004 - 20:37:48 BST
This archive was generated by hypermail 2.2.0 : Sun Jun 24 2018 - 04:00:02 BST