Date: Tue Jan 2 17:02:37 CET 2007
User: Derick Rethans
Directory: xdebug
Log Message:
[0.50]
- Namespace protect everything correctly.
Modified files:
xdebug/usefulstuff.c (version: 1.37)
xdebug/usefulstuff.h (version: 1.20)
xdebug/xdebug.c (version: 1.367)
xdebug/xdebug_handler_dbgp.c (version: 1.115)
xdebug/xdebug_handler_gdb.c (version: 1.84)
xdebug/xdebug_handler_php3.c (version: 1.22)
xdebug/xdebug_hash.c (version: 1.5)
xdebug/xdebug_llist.c (version: 1.5)
xdebug/xdebug_profiler.c (version: 1.46)
xdebug/xdebug_profiler.h (version: 1.13)
xdebug/xdebug_superglobals.c (version: 1.23)
xdebug/xdebug_var.c (version: 1.83)
xdebug/xdebug_var.h (version: 1.27)
xdebug/xdebug_xml.c (version: 1.13)
[FILE: /xdebug/usefulstuff.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xdebug/usefulstuff.c:1.36 Thu Dec 28 21:58:37 2006 GMT
+++ xdebug/usefulstuff.c Tue Jan 02 15:02:36 2007 GMT
@@ -41,7 +41,7 @@
#define READ_BUFFER_SIZE 128
-char* fd_read_line_delim(int socket, fd_buf *context, int type, unsigned char delim, int *length)
+char* xdebug_fd_read_line_delim(int socket, fd_buf *context, int type, unsigned char delim, int *length)
{
int size = 0, newl = 0, nbufsize = 0;
char *tmp;
[FILE: /xdebug/usefulstuff.h]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xdebug/usefulstuff.h:1.19 Thu Dec 28 21:58:37 2006 GMT
+++ xdebug/usefulstuff.h Tue Jan 02 15:02:36 2007 GMT
@@ -50,8 +50,8 @@
xdfree(arg); \
}
-#define fd_read_line(s,c,t) fd_read_line_delim(s, c, t, '\n', NULL)
-char* fd_read_line_delim(int socket, fd_buf *context, int type, unsigned char delim, int *length);
+#define xdebug_fd_read_line(s,c,t) xdebug_fd_read_line_delim(s, c, t, '\n', NULL)
+char* xdebug_fd_read_line_delim(int socket, fd_buf *context, int type, unsigned char delim, int *length);
char *xdebug_join(char *delim, xdebug_arg *args, int begin, int end);
void xdebug_explode(char *delim, char *str, xdebug_arg *args, int limit);
char* xdebug_memnstr(char *haystack, char *needle, int needle_len, char *end);
[FILE: /xdebug/xdebug.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- xdebug/xdebug.c:1.366 Thu Dec 28 21:59:06 2006 GMT
+++ xdebug/xdebug.c Tue Jan 02 15:02:36 2007 GMT
@@ -547,7 +547,7 @@
#endif
#endif
/* initialize aggregate call information hash */
- zend_hash_init_ex(&XG(aggr_calls), 50, NULL, (dtor_func_t) profile_aggr_call_entry_dtor, 1, 0);
+ zend_hash_init_ex(&XG(aggr_calls), 50, NULL, (dtor_func_t) xdebug_profile_aggr_call_entry_dtor, 1, 0);
/* Redirect compile and execute functions to our own */
old_compile_file = zend_compile_file;
@@ -636,7 +636,7 @@
return SUCCESS;
}
-void used_var_dtor (void *elem)
+static void xdebug_used_var_dtor(void *elem)
{
char *s = elem;
@@ -645,7 +645,7 @@
}
}
-void stack_element_dtor (void *dummy, void *elem)
+static void xdebug_stack_element_dtor(void *dummy, void *elem)
{
int i;
function_stack_entry *e = elem;
@@ -712,7 +712,7 @@
XG(do_code_coverage) = 0;
XG(code_coverage) = xdebug_hash_alloc(32, xdebug_coverage_file_dtor);
XG(code_coverage_op_array_cache) = xdebug_hash_alloc(1024, NULL);
- XG(stack) = xdebug_llist_alloc(stack_element_dtor);
+ XG(stack) = xdebug_llist_alloc(xdebug_stack_element_dtor);
XG(trace_file) = NULL;
XG(tracefile_name) = NULL;
XG(profile_file) = NULL;
@@ -985,7 +985,7 @@
tmp->user_defined = type;
tmp->filename = NULL;
tmp->include_filename = NULL;
- tmp->profile.call_list = xdebug_llist_alloc(profile_call_entry_dtor);
+ tmp->profile.call_list = xdebug_llist_alloc(xdebug_profile_call_entry_dtor);
tmp->op_array = op_array;
tmp->symbol_table = NULL;
@@ -1047,7 +1047,7 @@
if (tmp->function.type == XFUNC_EVAL) {
int is_var;
- tmp->include_filename = get_zval_value(get_zval(zdata, &zdata->opline->op1, zdata->Ts, &is_var), 0, NULL);
+ tmp->include_filename = xdebug_get_zval_value(get_zval(zdata, &zdata->opline->op1, zdata->Ts, &is_var), 0, NULL);
} else if (XG(collect_includes)) {
tmp->include_filename = xdstrdup(zend_get_executed_filename(TSRMLS_C));
}
@@ -1126,7 +1126,7 @@
}
if (XG(profiler_aggregate)) {
- char *func_name = show_fname(tmp->function, 0, 0 TSRMLS_CC);
+ char *func_name = xdebug_show_fname(tmp->function, 0, 0 TSRMLS_CC);
aggr_key = xdebug_sprintf("%s.%s.%d", tmp->filename, func_name, tmp->lineno);
aggr_key_len = strlen(aggr_key);
@@ -1186,7 +1186,7 @@
int j = op_array->size;
if (!fse->used_vars) {
- fse->used_vars = xdebug_hash_alloc(64, used_var_dtor);
+ fse->used_vars = xdebug_hash_alloc(64, xdebug_used_var_dtor);
}
/* Check parameters */
@@ -1525,7 +1525,7 @@
}
fse->symbol_table = NULL;
- xdebug_llist_remove(XG(stack), XDEBUG_LLIST_TAIL(XG(stack)), stack_element_dtor);
+ xdebug_llist_remove(XG(stack), XDEBUG_LLIST_TAIL(XG(stack)), xdebug_stack_element_dtor);
XG(level)--;
}
@@ -1584,7 +1584,7 @@
}
}
- xdebug_llist_remove(XG(stack), XDEBUG_LLIST_TAIL(XG(stack)), stack_element_dtor);
+ xdebug_llist_remove(XG(stack), XDEBUG_LLIST_TAIL(XG(stack)), xdebug_stack_element_dtor);
XG(level)--;
}
@@ -1665,9 +1665,9 @@
}
if (html) {
- contents = get_zval_value_fancy(NULL, zvar, &len, 0, NULL TSRMLS_CC);
+ contents = xdebug_get_zval_value_fancy(NULL, zvar, &len, 0, NULL TSRMLS_CC);
} else {
- contents = get_zval_value(zvar, 0, NULL);
+ contents = xdebug_get_zval_value(zvar, 0, NULL);
}
if (contents) {
@@ -1696,7 +1696,7 @@
xdebug_str log_buffer = {0, 0, NULL};
i = XDEBUG_LLIST_VALP(le);
- tmp_name = show_fname(i->function, 0, 0 TSRMLS_CC);
+ tmp_name = xdebug_show_fname(i->function, 0, 0 TSRMLS_CC);
xdebug_str_add(&log_buffer, xdebug_sprintf("PHP %3d. %s(", i->level, tmp_name), 1);
xdfree(tmp_name);
@@ -1710,7 +1710,7 @@
c = 1;
}
tmp_varname = i->var[j].name ? xdebug_sprintf("$%s = ", i->var[j].name) : xdstrdup("");
- tmp_value = get_zval_value(i->var[j].addr, 0, NULL);
+ tmp_value = xdebug_get_zval_value(i->var[j].addr, 0, NULL);
xdebug_str_add(&log_buffer, tmp_varname, 0);
xdebug_str_add(&log_buffer, tmp_value, 0);
xdfree(tmp_varname);
@@ -1756,7 +1756,7 @@
char *tmp_name;
i = XDEBUG_LLIST_VALP(le);
- tmp_name = show_fname(i->function, html, 0 TSRMLS_CC);
+ tmp_name = xdebug_show_fname(i->function, html, 0 TSRMLS_CC);
if (html) {
#if HAVE_PHP_MEMORY_USAGE
xdebug_str_add(&str, xdebug_sprintf(formats[3], i->level, i->time - XG(start_time), i->memory, tmp_name), 1);
@@ -1784,15 +1784,15 @@
}
if (html) {
- tmp_value = get_zval_value(i->var[j].addr, 0, NULL);
- tmp_fancy_value = xmlize(tmp_value, strlen(tmp_value), &newlen);
- tmp_fancy_synop_value = get_zval_synopsis_fancy("", i->var[j].addr, &len, 0, NULL TSRMLS_CC);
+ tmp_value = xdebug_get_zval_value(i->var[j].addr, 0, NULL);
+ tmp_fancy_value = xdebug_xmlize(tmp_value, strlen(tmp_value), &newlen);
+ tmp_fancy_synop_value = xdebug_get_zval_synopsis_fancy("", i->var[j].addr, &len, 0, NULL TSRMLS_CC);
xdebug_str_add(&str, xdebug_sprintf("<span title='%s'>%s</span>", tmp_fancy_value, tmp_fancy_synop_value), 1);
xdfree(tmp_value);
efree(tmp_fancy_value);
xdfree(tmp_fancy_synop_value);
} else {
- tmp_value = get_zval_synopsis(i->var[j].addr, 0, NULL);
+ tmp_value = xdebug_get_zval_synopsis(i->var[j].addr, 0, NULL);
if (tmp_value) {
xdebug_str_add(&str, xdebug_sprintf("%s", tmp_value), 1);
xdfree(tmp_value);
@@ -1870,7 +1870,7 @@
}
xdebug_str_addl(&str, " >=> ", 7, 0);
- tmp_value = get_zval_value(retval, 0, NULL);
+ tmp_value = xdebug_get_zval_value(retval, 0, NULL);
if (tmp_value) {
xdebug_str_add(&str, tmp_value, 1);
}
@@ -1886,7 +1886,7 @@
char *tmp_name;
xdebug_str str = {0, 0, NULL};
- tmp_name = show_fname(i->function, 0, 0 TSRMLS_CC);
+ tmp_name = xdebug_show_fname(i->function, 0, 0 TSRMLS_CC);
xdebug_str_add(&str, xdebug_sprintf("%10.4f ", i->time - XG(start_time)), 1);
xdebug_str_add(&str, xdebug_sprintf("%10lu ", i->memory), 1);
@@ -1910,7 +1910,7 @@
c = 1;
}
- tmp_value = get_zval_value(i->var[j].addr, 0, NULL);
+ tmp_value = xdebug_get_zval_value(i->var[j].addr, 0, NULL);
if (tmp_value) {
xdebug_str_add(&str, tmp_value, 1);
} else {
@@ -1938,7 +1938,7 @@
xdebug_str_add(&str, xdebug_sprintf("%d\t", i->level), 1);
xdebug_str_add(&str, xdebug_sprintf("%d\t", fnr), 1);
if (whence == 0) { /* start */
- tmp_name = show_fname(i->function, 0, 0 TSRMLS_CC);
+ tmp_name = xdebug_show_fname(i->function, 0, 0 TSRMLS_CC);
xdebug_str_add(&str, "0\t", 0);
xdebug_str_add(&str, xdebug_sprintf("%f\t", i->time - XG(start_time)), 1);
@@ -1982,7 +1982,7 @@
}
xdebug_str_add(&str, "-></td>", 0);
- tmp_name = show_fname(i->function, 0, 0 TSRMLS_CC);
+ tmp_name = xdebug_show_fname(i->function, 0, 0 TSRMLS_CC);
xdebug_str_add(&str, xdebug_sprintf("<td>%s(", tmp_name), 1);
xdfree(tmp_name);
@@ -2115,7 +2115,7 @@
buffer_len = vspprintf(&buffer, PG(log_errors_max_len), format, args);
- error_type_str = error_type(type);
+ error_type_str = xdebug_error_type(type);
#if PHP_MAJOR_VERSION >= 5
/* according to error handling mode, suppress error, throw exception or show it */
@@ -2288,7 +2288,7 @@
MAKE_STD_ZVAL(params);
array_init(params);
for (j = 0; j < i->varc; j++) {
- argument = get_zval_value(i->var[j].addr, 0, NULL);
+ argument = xdebug_get_zval_value(i->var[j].addr, 0, NULL);
if (i->var[j].name) {
add_assoc_string_ex(params, i->var[j].name, strlen(i->var[j].name) + 1, argument, 1);
} else {
@@ -2449,7 +2449,7 @@
for (i = 0; i < argc; i++) {
if (PG(html_errors)) {
- val = get_zval_value_fancy(NULL, (zval*) *args[i], &len, 0, NULL TSRMLS_CC);
+ val = xdebug_get_zval_value_fancy(NULL, (zval*) *args[i], &len, 0, NULL TSRMLS_CC);
PHPWRITE(val, len);
xdfree(val);
} else {
@@ -2486,10 +2486,10 @@
if (debugzval) {
php_printf("%s: ", Z_STRVAL_PP(args[i]));
if (PG(html_errors)) {
- val = get_zval_value_fancy(NULL, debugzval, &len, 1, NULL TSRMLS_CC);
+ val = xdebug_get_zval_value_fancy(NULL, debugzval, &len, 1, NULL TSRMLS_CC);
PHPWRITE(val, len);
} else {
- val = get_zval_value(debugzval, 1, NULL);
+ val = xdebug_get_zval_value(debugzval, 1, NULL);
PHPWRITE(val, strlen(val));
}
xdfree(val);
@@ -2526,7 +2526,7 @@
debugzval = xdebug_get_php_symbol(Z_STRVAL_PP(args[i]), Z_STRLEN_PP(args[i]) + 1);
if (debugzval) {
printf("%s: ", Z_STRVAL_PP(args[i]));
- val = get_zval_value(debugzval, 1, NULL);
+ val = xdebug_get_zval_value(debugzval, 1, NULL);
printf("%s(%d)", val, strlen(val));
xdfree(val);
printf("\n");
[FILE: /xdebug/xdebug_handler_dbgp.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- xdebug/xdebug_handler_dbgp.c:1.114 Thu Dec 28 21:59:07 2006 GMT
+++ xdebug/xdebug_handler_dbgp.c Tue Jan 02 15:02:37 2007 GMT
@@ -572,13 +572,13 @@
retval = get_symbol_contents_zval(name, name_length TSRMLS_CC);
if (retval) {
- return get_zval_value_xml_node(name, retval, options);
+ return xdebug_get_zval_value_xml_node(name, retval, options);
}
return NULL;
}
-int get_symbol_contents(char* name, int name_length, xdebug_xml_node *node, xdebug_var_export_options *options TSRMLS_DC)
+static int get_symbol_contents(char* name, int name_length, xdebug_xml_node *node, xdebug_var_export_options *options TSRMLS_DC)
{
zval *retval;
@@ -700,7 +700,7 @@
fse = xdebug_get_stack_frame(nr TSRMLS_CC);
fse_prev = xdebug_get_stack_frame(nr - 1 TSRMLS_CC);
- tmp_fname = show_fname(fse->function, 0, 0 TSRMLS_CC);
+ tmp_fname = xdebug_show_fname(fse->function, 0, 0 TSRMLS_CC);
tmp = xdebug_xml_node_init("stack");
xdebug_xml_add_attribute_ex(tmp, "where", xdstrdup(tmp_fname), 0, 1);
@@ -1168,7 +1168,7 @@
xdebug_xml_add_attribute_ex(*retval, "id", xdebug_sprintf("%d", brk_id), 0, 1);
}
-static int _xdebug_do_eval(char *eval_string, zval *ret_zval TSRMLS_DC)
+static int xdebug_do_eval(char *eval_string, zval *ret_zval TSRMLS_DC)
{
int old_error_reporting;
int res;
@@ -1206,7 +1206,7 @@
/* base64 decode eval string */
eval_string = (char*) xdebug_base64_decode((unsigned char*) CMD_OPTION('-'), strlen(CMD_OPTION('-')), &new_length);
- res = _xdebug_do_eval(eval_string, &ret_zval TSRMLS_CC);
+ res = xdebug_do_eval(eval_string, &ret_zval TSRMLS_CC);
efree(eval_string);
@@ -1214,7 +1214,7 @@
if (res == FAILURE) {
RETURN_RESULT(XG(status), XG(reason), XDEBUG_ERROR_EVALUATING_CODE);
} else {
- ret_xml = get_zval_value_xml_node(NULL, &ret_zval, options);
+ ret_xml = xdebug_get_zval_value_xml_node(NULL, &ret_zval, options);
xdebug_xml_add_child(*retval, ret_xml);
zval_dtor(&ret_zval);
}
@@ -1222,7 +1222,7 @@
/* these functions interupt PHP's output functions, so we can
redirect to our remote debugger! */
-static int _xdebug_send_stream(const char *name, const char *str, uint str_length TSRMLS_DC)
+static int xdebug_send_stream(const char *name, const char *str, uint str_length TSRMLS_DC)
{
/* create an xml document to send as the stream */
xdebug_xml_node *message;
@@ -1236,20 +1236,20 @@
return 0;
}
-static int _xdebug_header_write(const char *str, uint str_length TSRMLS_DC)
+static int xdebug_header_write(const char *str, uint str_length TSRMLS_DC)
{
/* nesting_level is zero when final output is sent to sapi */
if (OG(ob_nesting_level) < 1) {
zend_unset_timeout(TSRMLS_C);
if (XG(stdout_redirected) != 0) {
- _xdebug_send_stream("stdout", str, str_length TSRMLS_CC);
+ xdebug_send_stream("stdout", str, str_length TSRMLS_CC);
}
zend_set_timeout(EG(timeout_seconds));
}
return XG(stdio).php_header_write(str, str_length TSRMLS_CC);
}
-static int _xdebug_body_write(const char *str, uint str_length TSRMLS_DC)
+static int xdebug_body_write(const char *str, uint str_length TSRMLS_DC)
{
/* nesting_level is zero when final output is sent to sapi. We also dont
* want to write if headers are not sent yet, the output layer will handle
@@ -1257,7 +1257,7 @@
if (OG(ob_nesting_level) < 1 && SG(headers_sent)) {
zend_unset_timeout(TSRMLS_C);
if (XG(stdout_redirected) != 0) {
- _xdebug_send_stream("stdout", str, str_length TSRMLS_CC);
+ xdebug_send_stream("stdout", str, str_length TSRMLS_CC);
}
zend_set_timeout(EG(timeout_seconds));
}
@@ -1292,9 +1292,9 @@
} else if (mode != 0 && XG(stdout_redirected) == 0) {
if (XG(stdio).php_body_write == NULL && OG(php_body_write)) {
XG(stdio).php_body_write = OG(php_body_write);
- OG(php_body_write) = _xdebug_body_write;
+ OG(php_body_write) = xdebug_body_write;
XG(stdio).php_header_write = OG(php_header_write);
- OG(php_header_write) = _xdebug_header_write;
+ OG(php_header_write) = xdebug_header_write;
success = "1";
}
}
@@ -1717,7 +1717,7 @@
} else {
/* Do the eval */
eval_string = xdebug_sprintf("%s = %s", CMD_OPTION('n'), new_value);
- res = _xdebug_do_eval(eval_string, &ret_zval TSRMLS_CC);
+ res = xdebug_do_eval(eval_string, &ret_zval TSRMLS_CC);
/* Free data */
xdfree(eval_string);
@@ -1786,6 +1786,7 @@
RETURN_RESULT(XG(status), XG(reason), XDEBUG_ERROR_PROPERTY_NON_EXISTANT);
}
}
+
static void attach_used_var_with_contents(void *xml, xdebug_hash_element* he, void *options)
{
char *name = (char*) he->ptr;
@@ -1955,7 +1956,7 @@
#define STATE_SKIP_CHAR 6
/* }}} */
-void xdebug_dbgp_arg_dtor(xdebug_dbgp_arg *arg)
+static void xdebug_dbgp_arg_dtor(xdebug_dbgp_arg *arg)
{
int i;
@@ -1967,7 +1968,7 @@
xdfree(arg);
}
-int xdebug_dbgp_parse_cmd(char *line, char **cmd, xdebug_dbgp_arg **ret_args)
+static int xdebug_dbgp_parse_cmd(char *line, char **cmd, xdebug_dbgp_arg **ret_args)
{
xdebug_dbgp_arg *args = NULL;
char *ptr;
@@ -2096,7 +2097,7 @@
return XDEBUG_ERROR_DUP_ARG;
}
-int xdebug_dbgp_parse_option(xdebug_con *context, char* line, int flags, xdebug_xml_node *retval TSRMLS_DC)
+static int xdebug_dbgp_parse_option(xdebug_con *context, char* line, int flags, xdebug_xml_node *retval TSRMLS_DC)
{
char *cmd = NULL;
int res, ret = 0;
@@ -2176,17 +2177,17 @@
char *xdebug_dbgp_get_revision(void)
{
- return "$Revision: 1.114 $";
+ return "$Revision: 1.115 $";
}
-int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
+static int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
{
char *option;
int ret;
xdebug_xml_node *response;
do {
- option = fd_read_line_delim(context->socket, context->buffer, FD_RL_SOCKET, '\0', NULL);
+ option = xdebug_fd_read_line_delim(context->socket, context->buffer, FD_RL_SOCKET, '\0', NULL);
if (!option) {
return 0;
}
@@ -2380,7 +2381,7 @@
if (exception_type) {
errortype = exception_type;
} else {
- errortype = error_type(type);
+ errortype = xdebug_error_type(type);
}
if (exception_type) {
[FILE: /xdebug/xdebug_handler_gdb.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- xdebug/xdebug_handler_gdb.c:1.83 Thu Dec 28 21:58:37 2006 GMT
+++ xdebug/xdebug_handler_gdb.c Tue Jan 02 15:02:37 2007 GMT
@@ -198,7 +198,7 @@
switch (options->response_format) {
case XDEBUG_RESPONSE_XML:
/* we ignore binary safety here */
- tmp = xmlize(message, strlen(message), &len);
+ tmp = xdebug_xmlize(message, strlen(message), &len);
ret = xdebug_sprintf("<xdebug><%s><code>%d</code><message>%s</message></%s></xdebug>", type, error_code, tmp, type);
efree(tmp);
return ret;
@@ -268,7 +268,7 @@
switch (fmt) {
case XDEBUG_RESPONSE_XML:
/* we ignore binary safety here */
- tmp = xmlize(ptr->help, strlen(ptr->help), &len);
+ tmp = xdebug_xmlize(ptr->help, strlen(ptr->help), &len);
SENDMSG(h->socket, xdebug_sprintf("<command><name>%s</name><desc>%s</desc></command>", ptr->name, tmp));
efree(tmp);
break;
@@ -311,8 +311,8 @@
if (cmd) {
if (o->response_format == XDEBUG_RESPONSE_XML) {
/* we ignore binary safety here */
- t1 = xmlize(cmd->description, strlen(cmd->description), &len);
- t2 = xmlize(cmd->help, strlen(cmd->help), &len);
+ t1 = xdebug_xmlize(cmd->description, strlen(cmd->description), &len);
+ t2 = xdebug_xmlize(cmd->help, strlen(cmd->help), &len);
SENDMSG(h->socket, xdebug_sprintf("<xdebug><help><command><syntax>%s</syntax><desc>%s</desc></help</xdebug>\n", t1, t2));
efree(t1);
efree(t2);
@@ -336,7 +336,7 @@
switch (options->response_format) {
case XDEBUG_RESPONSE_NORMAL:
if (val) {
- str_rep = get_zval_value(val, 0, xdebug_var_get_nolimit_options(TSRMLS_C));
+ str_rep = xdebug_get_zval_value(val, 0, xdebug_var_get_nolimit_options(TSRMLS_C));
} else {
str_rep = xdstrdup("*uninitialized*");
}
@@ -351,7 +351,7 @@
case XDEBUG_RESPONSE_XML:
default:
- return get_zval_value_xml(name, val);
+ return xdebug_get_zval_value_xml(name, val);
}
}
@@ -446,7 +446,7 @@
free(line);
line = NULL;
}
- line = fd_read_line(fd, &fd_buffer, FD_RL_FILE);
+ line = xdebug_fd_read_line(fd, &fd_buffer, FD_RL_FILE);
i--;
}
/* Read until the "end" line has been read */
@@ -455,7 +455,7 @@
update = 1;
if (response_format == XDEBUG_RESPONSE_XML) {
/* we ignore binary safety here */
- tmp = xmlize(line, strlen(line), &len);
+ tmp = xdebug_xmlize(line, strlen(line), &len);
SENDMSG(h->socket, xdebug_sprintf("<line file='%s' no='%d'>%s</line>", file, begin + i, tmp));
efree(tmp);
} else {
@@ -464,7 +464,7 @@
free(line);
line = NULL;
}
- line = fd_read_line(fd, &fd_buffer, FD_RL_FILE);
+ line = xdebug_fd_read_line(fd, &fd_buffer, FD_RL_FILE);
i++;
} while (i < end + 1 - begin);
@@ -502,7 +502,7 @@
* Breakpoint 2, xdebug_execute (op_array=0x82caf50)
* at /dat/dev/php/xdebug/xdebug.c:361
*/
- tmp_fname = show_fname(i->function, 0, 0 TSRMLS_CC);
+ tmp_fname = xdebug_show_fname(i->function, 0, 0 TSRMLS_CC);
if (xml) {
SENDMSG(h->socket, xdebug_sprintf("<breakpoint><function><name>%s</name><params>", tmp_fname));
} else {
@@ -521,9 +521,9 @@
if (i->var[j].name) {
SENDMSG(h->socket, xdebug_sprintf("$%s = ", i->var[j].name));
}
- tmp_value = get_zval_value(i->var[j].addr, 0, xdebug_var_get_nolimit_options(TSRMLS_C));
+ tmp_value = xdebug_get_zval_value(i->var[j].addr, 0, xdebug_var_get_nolimit_options(TSRMLS_C));
/* we ignore binary safety here */
- tmp = xmlize(tmp_value, strlen(tmp_value), &len);
+ tmp = xdebug_xmlize(tmp_value, strlen(tmp_value), &len);
SSENDL(h->socket, tmp, len);
xdfree(tmp_value);
efree(tmp);
@@ -551,7 +551,7 @@
* at /dat/dev/php/xdebug/xdebug.c:901
*
*/
- tmp_fname = show_fname(i->function, 0, 0 TSRMLS_CC);
+ tmp_fname = xdebug_show_fname(i->function, 0, 0 TSRMLS_CC);
if (response_format == XDEBUG_RESPONSE_XML) {
if (nr) {
SENDMSG(h->socket, xdebug_sprintf("<stackframe><level>%d</level><function><name>%s</name><params>", nr, tmp_fname));
@@ -578,9 +578,9 @@
if (i->var[j].name) {
SENDMSG(h->socket, xdebug_sprintf("$%s = ", i->var[j].name));
}
- tmp_value = get_zval_value(i->var[j].addr, 0, xdebug_var_get_nolimit_options(TSRMLS_C));
+ tmp_value = xdebug_get_zval_value(i->var[j].addr, 0, xdebug_var_get_nolimit_options(TSRMLS_C));
/* we ignore binary safety here */
- tmp = xmlize(tmp_value, strlen(tmp_value), &len);
+ tmp = xdebug_xmlize(tmp_value, strlen(tmp_value), &len);
SSENDL(h->socket, tmp, len);
xdfree(tmp_value);
efree(tmp);
@@ -1106,7 +1106,7 @@
if (options->response_format == XDEBUG_RESPONSE_XML) {
if (condition) {
/* we ignore binary safety here */
- condition = xmlize(brk_info->condition, strlen(brk_info->condition), &len);
+ condition = xdebug_xmlize(brk_info->condition, strlen(brk_info->condition), &len);
SENDMSG(h->socket,
xdebug_sprintf("<breakpoint type='line' condition='%s'><file>%s</file><line>%d</line></breakpoint>",
condition,
@@ -1222,7 +1222,7 @@
** Parsing functions
*/
-int xdebug_gdb_parse_option(xdebug_con *context, char* line, int flags, char *end_cmd, char **error)
+static int xdebug_gdb_parse_option(xdebug_con *context, char* line, int flags, char *end_cmd, char **error)
{
char *ptr;
xdebug_gdb_cmd *cmd;
@@ -1335,7 +1335,7 @@
char *xdebug_gdb_get_revision(void)
{
- return "$Revision: 1.83 $";
+ return "$Revision: 1.84 $";
}
int xdebug_gdb_init(xdebug_con *context, int mode)
@@ -1374,7 +1374,7 @@
context->line_breakpoints = xdebug_llist_alloc((xdebug_llist_dtor) xdebug_llist_brk_dtor);
do {
SENDMSG(context->socket, xdebug_sprintf("?init %s\n", context->program_name));
- option = fd_read_line(context->socket, context->buffer, FD_RL_SOCKET);
+ option = xdebug_fd_read_line(context->socket, context->buffer, FD_RL_SOCKET);
if (!option) {
return 0;
}
@@ -1410,7 +1410,7 @@
if (exception_type) {
errortype = exception_type;
} else {
- errortype = error_type(type);
+ errortype = xdebug_error_type(type);
}
runtime_allowed = (
@@ -1435,7 +1435,7 @@
do {
SSEND(context->socket, "?cmd\n");
- option = fd_read_line(context->socket, context->buffer, FD_RL_SOCKET);
+ option = xdebug_fd_read_line(context->socket, context->buffer, FD_RL_SOCKET);
if (!option) {
return 0;
}
@@ -1468,7 +1468,7 @@
do {
SSEND(context->socket, "?cmd\n");
- option = fd_read_line(context->socket, context->buffer, FD_RL_SOCKET);
+ option = xdebug_fd_read_line(context->socket, context->buffer, FD_RL_SOCKET);
if (!option) {
return 0;
}
[FILE: /xdebug/xdebug_handler_php3.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xdebug/xdebug_handler_php3.c:1.21 Thu Dec 28 21:58:37 2006 GMT
+++ xdebug/xdebug_handler_php3.c Tue Jan 02 15:02:37 2007 GMT
@@ -74,7 +74,7 @@
char *xdebug_php3_get_revision(void)
{
- return "$Revision: 1.21 $";
+ return "$Revision: 1.22 $";
}
int xdebug_php3_init(xdebug_con *context, int mode)
@@ -113,7 +113,7 @@
if (exception_type) {
errortype = exception_type;
} else {
- errortype = error_type(type);
+ errortype = xdebug_error_type(type);
}
/* start */
@@ -131,7 +131,7 @@
function_stack_entry *i = XDEBUG_LLIST_VALP(le);
char *tmp_name;
- tmp_name = show_fname(i->function, 0, 0 TSRMLS_CC);
+ tmp_name = xdebug_show_fname(i->function, 0, 0 TSRMLS_CC);
SENDMSG(h->socket, xdebug_sprintf("%sfunction: %s\n", prefix, tmp_name));
xdfree(tmp_name);
[FILE: /xdebug/xdebug_hash.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdebug/xdebug_hash.c:1.4 Sun Jan 22 22:30:59 2006 GMT
+++ xdebug/xdebug_hash.c Tue Jan 02 15:02:37 2007 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.4 2006/01/22 23:30:59 derick Exp $ */
+/* $Id: cvstemp,v 1.5 2007/01/02 16:02:37 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
[FILE: /xdebug/xdebug_llist.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdebug/xdebug_llist.c:1.4 Thu Feb 20 13:30:54 2003 GMT
+++ xdebug/xdebug_llist.c Tue Jan 02 15:02:37 2007 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.4 2003/02/20 14:30:54 derick Exp $ */
+/* $Id: cvstemp,v 1.5 2007/01/02 16:02:37 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
[FILE: /xdebug/xdebug_profiler.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xdebug/xdebug_profiler.c:1.45 Thu Dec 28 21:58:37 2006 GMT
+++ xdebug/xdebug_profiler.c Tue Jan 02 15:02:37 2007 GMT
@@ -32,7 +32,7 @@
ZEND_EXTERN_MODULE_GLOBALS(xdebug)
-void profile_aggr_call_entry_dtor(void *elem)
+void xdebug_profile_aggr_call_entry_dtor(void *elem)
{
xdebug_aggregate_entry *xae = (xdebug_aggregate_entry *) elem;
if (xae->filename) {
@@ -43,7 +43,7 @@
}
}
-void profile_call_entry_dtor(void *dummy, void *elem)
+void xdebug_profile_call_entry_dtor(void *dummy, void *elem)
{
xdebug_call_entry *ce = elem;
@@ -154,7 +154,7 @@
int default_lineno = 0;
xdebug_profiler_function_push(fse);
- tmp_name = show_fname(fse->function, 0, 0 TSRMLS_CC);
+ tmp_name = xdebug_show_fname(fse->function, 0, 0 TSRMLS_CC);
switch (fse->function.type) {
case XFUNC_INCLUDE:
case XFUNC_INCLUDE_ONCE:
[FILE: /xdebug/xdebug_profiler.h]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xdebug/xdebug_profiler.h:1.12 Thu Dec 28 21:58:37 2006 GMT
+++ xdebug/xdebug_profiler.h Tue Jan 02 15:02:37 2007 GMT
@@ -33,7 +33,7 @@
void xdebug_profiler_function_internal_begin(function_stack_entry *fse TSRMLS_DC);
void xdebug_profiler_function_internal_end(function_stack_entry *fse TSRMLS_DC);
-void profile_call_entry_dtor(void *dummy, void *elem);
-void profile_aggr_call_entry_dtor(void *elem);
+void xdebug_profile_call_entry_dtor(void *dummy, void *elem);
+void xdebug_profile_aggr_call_entry_dtor(void *elem);
#endif
[FILE: /xdebug/xdebug_superglobals.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xdebug/xdebug_superglobals.c:1.22 Thu Dec 28 21:58:38 2006 GMT
+++ xdebug/xdebug_superglobals.c Tue Jan 02 15:02:37 2007 GMT
@@ -45,7 +45,7 @@
char *val;
if (html) {
- val = get_zval_value_fancy(NULL, z, &len, 0, NULL TSRMLS_CC);
+ val = xdebug_get_zval_value_fancy(NULL, z, &len, 0, NULL TSRMLS_CC);
#if HAVE_PHP_MEMORY_USAGE
xdebug_str_add(str, xdebug_sprintf("<td colspan='3' bgcolor='#eeeeec'>"), 1);
#else
@@ -54,7 +54,7 @@
xdebug_str_addl(str, val, len, 0);
xdebug_str_add(str, "</td>", 0);
} else {
- val = get_zval_value(z, 0, NULL);
+ val = xdebug_get_zval_value(z, 0, NULL);
xdebug_str_add(str, xdebug_sprintf("\n $%s['%s'] = %s", name, elem, val), 1);
}
xdfree(val);
[FILE: /xdebug/xdebug_var.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- xdebug/xdebug_var.c:1.82 Thu Dec 28 21:58:38 2006 GMT
+++ xdebug/xdebug_var.c Tue Jan 02 15:02:37 2007 GMT
@@ -30,7 +30,7 @@
ZEND_EXTERN_MODULE_GLOBALS(xdebug)
-char *error_type(int type)
+char* xdebug_error_type(int type)
{
switch (type) {
case E_ERROR:
@@ -341,7 +341,7 @@
}
}
-char* get_zval_value(zval *val, int debug_zval, xdebug_var_export_options *options)
+char* xdebug_get_zval_value(zval *val, int debug_zval, xdebug_var_export_options *options)
{
xdebug_str str = {0, 0, NULL};
int default_options = 0;
@@ -411,7 +411,7 @@
}
}
-char* get_zval_synopsis(zval *val, int debug_zval, xdebug_var_export_options *options)
+char* xdebug_get_zval_synopsis(zval *val, int debug_zval, xdebug_var_export_options *options)
{
xdebug_str str = {0, 0, NULL};
int default_options = 0;
@@ -507,7 +507,7 @@
case IS_STRING:
xdebug_str_addl(str, "<string>", 8, 0);
- tmp_str = xmlize(Z_STRVAL_PP(struc), Z_STRLEN_PP(struc), &newlen);
+ tmp_str = xdebug_xmlize(Z_STRVAL_PP(struc), Z_STRLEN_PP(struc), &newlen);
xdebug_str_addl(str, tmp_str, newlen, 0);
efree(tmp_str);
xdebug_str_addl(str, "</string>", 9, 0);
@@ -549,7 +549,7 @@
}
}
-char* get_zval_value_xml(char *name, zval *val)
+char* xdebug_get_zval_value_xml(char *name, zval *val)
{
xdebug_str str = {0, 0, NULL};
TSRMLS_FETCH();
@@ -779,7 +779,7 @@
}
}
-xdebug_xml_node* get_zval_value_xml_node(char *name, zval *val, xdebug_var_export_options *options)
+xdebug_xml_node* xdebug_get_zval_value_xml_node(char *name, zval *val, xdebug_var_export_options *options)
{
xdebug_xml_node *node;
char *full_name = NULL;
@@ -915,12 +915,12 @@
case IS_STRING:
xdebug_str_add(str, xdebug_sprintf("<small>string</small> <font color='%s'>'", COLOR_STRING), 1);
if (Z_STRLEN_PP(struc) > options->max_data) {
- tmp_str = xmlize(Z_STRVAL_PP(struc), options->max_data, &newlen);
+ tmp_str = xdebug_xmlize(Z_STRVAL_PP(struc), options->max_data, &newlen);
xdebug_str_addl(str, tmp_str, newlen, 0);
efree(tmp_str);
xdebug_str_addl(str, "'...</font>", 11, 0);
} else {
- tmp_str = xmlize(Z_STRVAL_PP(struc), Z_STRLEN_PP(struc), &newlen);
+ tmp_str = xdebug_xmlize(Z_STRVAL_PP(struc), Z_STRLEN_PP(struc), &newlen);
xdebug_str_addl(str, tmp_str, newlen, 0);
efree(tmp_str);
xdebug_str_addl(str, "'</font>", 8, 0);
@@ -1000,7 +1000,7 @@
}
}
-char* get_zval_value_fancy(char *name, zval *val, int *len, int debug_zval, xdebug_var_export_options *options TSRMLS_DC)
+char* xdebug_get_zval_value_fancy(char *name, zval *val, int *len, int debug_zval, xdebug_var_export_options *options TSRMLS_DC)
{
xdebug_str str = {0, 0, NULL};
int default_options = 0;
@@ -1073,7 +1073,7 @@
}
}
-char* get_zval_synopsis_fancy(char *name, zval *val, int *len, int debug_zval, xdebug_var_export_options *options TSRMLS_DC)
+char* xdebug_get_zval_synopsis_fancy(char *name, zval *val, int *len, int debug_zval, xdebug_var_export_options *options TSRMLS_DC)
{
xdebug_str str = {0, 0, NULL};
int default_options = 0;
@@ -1097,7 +1097,7 @@
** XML encoding function
*/
-char* xmlize(char *string, int len, int *newlen)
+char* xdebug_xmlize(char *string, int len, int *newlen)
{
char *tmp;
char *tmp2;
@@ -1130,7 +1130,7 @@
** Function name printing function
*/
-char* show_fname(xdebug_func f, int html, int flags TSRMLS_DC)
+char* xdebug_show_fname(xdebug_func f, int html, int flags TSRMLS_DC)
{
char *tmp;
[FILE: /xdebug/xdebug_var.h]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xdebug/xdebug_var.h:1.26 Thu Dec 28 21:58:38 2006 GMT
+++ xdebug/xdebug_var.h Tue Jan 02 15:02:37 2007 GMT
@@ -50,16 +50,16 @@
void xdebug_var_export_fancy(zval **struc, xdebug_str *str, int level, int debug_zval, xdebug_var_export_options *options TSRMLS_DC);
void xdebug_var_export_xml_node(zval **struc, char *name, xdebug_xml_node *node, xdebug_var_export_options *options, int level TSRMLS_DC);
-char* xmlize(char *string, int len, int *newlen);
-char* error_type (int type);
-char* get_zval_value (zval *val, int debug_zval, xdebug_var_export_options *options);
-char* get_zval_value_xml (char *name, zval *val);
-char* get_zval_value_fancy(char *name, zval *val, int *len, int debug_zval, xdebug_var_export_options *options TSRMLS_DC);
-xdebug_xml_node* get_zval_value_xml_node (char *name, zval *val, xdebug_var_export_options *options);
+char* xdebug_xmlize(char *string, int len, int *newlen);
+char* xdebug_error_type(int type);
+char* xdebug_get_zval_value(zval *val, int debug_zval, xdebug_var_export_options *options);
+char* xdebug_get_zval_value_xml(char *name, zval *val);
+char* xdebug_get_zval_value_fancy(char *name, zval *val, int *len, int debug_zval, xdebug_var_export_options *options TSRMLS_DC);
+xdebug_xml_node* xdebug_get_zval_value_xml_node(char *name, zval *val, xdebug_var_export_options *options);
-char* get_zval_synopsis(zval *val, int debug_zval, xdebug_var_export_options *options);
-char* get_zval_synopsis_fancy(char *name, zval *val, int *len, int debug_zval, xdebug_var_export_options *options TSRMLS_DC);
+char* xdebug_get_zval_synopsis(zval *val, int debug_zval, xdebug_var_export_options *options);
+char* xdebug_get_zval_synopsis_fancy(char *name, zval *val, int *len, int debug_zval, xdebug_var_export_options *options TSRMLS_DC);
-char* show_fname(xdebug_func t, int html, int flags TSRMLS_DC);
+char* xdebug_show_fname(xdebug_func t, int html, int flags TSRMLS_DC);
#endif
[FILE: /xdebug/xdebug_xml.c]
===================================================================
RCS file: cvstemp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xdebug/xdebug_xml.c:1.12 Thu Dec 28 21:58:38 2006 GMT
+++ xdebug/xdebug_xml.c Tue Jan 02 15:02:37 2007 GMT
@@ -33,7 +33,7 @@
xdebug_str_add(output, attr->name, 0);
xdebug_str_addl(output, "=\"", 2, 0);
if (attr->value) {
- tmp = xmlize(attr->value, strlen(attr->value), &newlen);
+ tmp = xdebug_xmlize(attr->value, strlen(attr->value), &newlen);
xdebug_str_add(output, tmp, 0);
efree(tmp);
}
Received on Tue Jan 02 2007 - 17:02:41 GMT
This archive was generated by hypermail 2.2.0 : Sun Jun 24 2018 - 04:00:03 BST