X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fxml-support.c;h=e3d57d1646324a32f00b6326b93d4336274beeb2;hb=b08b78e7d4bb56f395d3212eed6184ede236c760;hp=e0ac8de68b96200220a460b76feafc730eaaa2ef;hpb=3d2c1d41d4b6cdaa6052ddfd99b0745cc70c9cbb;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/xml-support.c b/gdb/xml-support.c index e0ac8de68b..e3d57d1646 100644 --- a/gdb/xml-support.c +++ b/gdb/xml-support.c @@ -1,7 +1,6 @@ /* Helper routines for parsing XML using Expat. - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This file is part of GDB. @@ -20,10 +19,8 @@ #include "defs.h" #include "gdbcmd.h" -#include "exceptions.h" #include "xml-support.h" - -#include "gdb_string.h" +#include "filestuff.h" #include "safe-ctype.h" /* Debugging flag. */ @@ -86,7 +83,7 @@ struct gdb_xml_parser static void gdb_xml_body_text (void *data, const XML_Char *text, int length) { - struct gdb_xml_parser *parser = data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data; struct scope_level *scope = VEC_last (scope_level_s, parser->scopes); if (parser->error.reason < 0) @@ -94,7 +91,7 @@ gdb_xml_body_text (void *data, const XML_Char *text, int length) if (scope->body == NULL) { - scope->body = XZALLOC (struct obstack); + scope->body = XCNEW (struct obstack); obstack_init (scope->body); } @@ -159,7 +156,7 @@ xml_find_attribute (VEC(gdb_xml_value_s) *attributes, const char *name) static void gdb_xml_values_cleanup (void *data) { - VEC(gdb_xml_value_s) **values = data; + VEC(gdb_xml_value_s) **values = (VEC(gdb_xml_value_s) **) data; struct gdb_xml_value *value; int ix; @@ -176,7 +173,7 @@ static void gdb_xml_start_element (void *data, const XML_Char *name, const XML_Char **attrs) { - struct gdb_xml_parser *parser = data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data; struct scope_level *scope; struct scope_level new_scope; const struct gdb_xml_element *element; @@ -315,23 +312,23 @@ static void gdb_xml_start_element_wrapper (void *data, const XML_Char *name, const XML_Char **attrs) { - struct gdb_xml_parser *parser = data; - volatile struct gdb_exception ex; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data; if (parser->error.reason < 0) return; - TRY_CATCH (ex, RETURN_MASK_ALL) + TRY { gdb_xml_start_element (data, name, attrs); } - if (ex.reason < 0) + CATCH (ex, RETURN_MASK_ALL) { parser->error = ex; #ifdef HAVE_XML_STOPPARSER XML_StopParser (parser->expat_parser, XML_FALSE); #endif } + END_CATCH } /* Handle the end of an element. DATA is our local XML parser, and @@ -340,7 +337,7 @@ gdb_xml_start_element_wrapper (void *data, const XML_Char *name, static void gdb_xml_end_element (void *data, const XML_Char *name) { - struct gdb_xml_parser *parser = data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data; struct scope_level *scope = VEC_last (scope_level_s, parser->scopes); const struct gdb_xml_element *element; unsigned int seen; @@ -368,7 +365,7 @@ gdb_xml_end_element (void *data, const XML_Char *name) length = obstack_object_size (scope->body); obstack_1grow (scope->body, '\0'); - body = obstack_finish (scope->body); + body = (char *) obstack_finish (scope->body); /* Strip leading and trailing whitespace. */ while (length > 0 && ISSPACE (body[length-1])) @@ -398,23 +395,23 @@ gdb_xml_end_element (void *data, const XML_Char *name) static void gdb_xml_end_element_wrapper (void *data, const XML_Char *name) { - struct gdb_xml_parser *parser = data; - volatile struct gdb_exception ex; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data; if (parser->error.reason < 0) return; - TRY_CATCH (ex, RETURN_MASK_ALL) + TRY { gdb_xml_end_element (data, name); } - if (ex.reason < 0) + CATCH (ex, RETURN_MASK_ALL) { parser->error = ex; #ifdef HAVE_XML_STOPPARSER XML_StopParser (parser->expat_parser, XML_FALSE); #endif } + END_CATCH } /* Free a parser and all its associated state. */ @@ -422,7 +419,7 @@ gdb_xml_end_element_wrapper (void *data, const XML_Char *name) static void gdb_xml_cleanup (void *arg) { - struct gdb_xml_parser *parser = arg; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) arg; struct scope_level *scope; int ix; @@ -440,25 +437,26 @@ gdb_xml_cleanup (void *arg) xfree (parser); } -/* Initialize and return a parser. Register a cleanup to destroy the - parser. */ +/* Initialize a parser and store it to *PARSER_RESULT. Register a + cleanup to destroy the parser. */ -static struct gdb_xml_parser * -gdb_xml_create_parser_and_cleanup_1 (const char *name, - const struct gdb_xml_element *elements, - void *user_data, struct cleanup **old_chain) +static struct cleanup * +gdb_xml_create_parser_and_cleanup (const char *name, + const struct gdb_xml_element *elements, + void *user_data, + struct gdb_xml_parser **parser_result) { struct gdb_xml_parser *parser; struct scope_level start_scope; - struct cleanup *dummy; + struct cleanup *result; /* Initialize the parser. */ - parser = XZALLOC (struct gdb_xml_parser); + parser = XCNEW (struct gdb_xml_parser); parser->expat_parser = XML_ParserCreateNS (NULL, '!'); if (parser->expat_parser == NULL) { xfree (parser); - nomem (0); + malloc_failure (0); } parser->name = name; @@ -476,25 +474,8 @@ gdb_xml_create_parser_and_cleanup_1 (const char *name, start_scope.elements = elements; VEC_safe_push (scope_level_s, parser->scopes, &start_scope); - if (old_chain == NULL) - old_chain = &dummy; - - *old_chain = make_cleanup (gdb_xml_cleanup, parser); - return parser; -} - -/* Initialize and return a parser. Register a cleanup to destroy the - parser. */ - -struct gdb_xml_parser * -gdb_xml_create_parser_and_cleanup (const char *name, - const struct gdb_xml_element *elements, - void *user_data) -{ - struct cleanup *old_chain; - - return gdb_xml_create_parser_and_cleanup_1 (name, elements, user_data, - &old_chain); + *parser_result = parser; + return make_cleanup (gdb_xml_cleanup, parser); } /* External entity handler. The only external entities we support @@ -508,7 +489,8 @@ gdb_xml_fetch_external_entity (XML_Parser expat_parser, const XML_Char *systemId, const XML_Char *publicId) { - struct gdb_xml_parser *parser = XML_GetUserData (expat_parser); + struct gdb_xml_parser *parser + = (struct gdb_xml_parser *) XML_GetUserData (expat_parser); XML_Parser entity_parser; const char *text; enum XML_Status status; @@ -623,8 +605,8 @@ gdb_xml_parse_quick (const char *name, const char *dtd_name, struct cleanup *back_to; int result; - parser = gdb_xml_create_parser_and_cleanup_1 (name, elements, - user_data, &back_to); + back_to = gdb_xml_create_parser_and_cleanup (name, elements, + user_data, &parser); if (dtd_name != NULL) gdb_xml_use_dtd (parser, dtd_name); result = gdb_xml_parse (parser, document); @@ -685,7 +667,7 @@ gdb_xml_parse_attr_ulongest (struct gdb_xml_parser *parser, gdb_xml_error (parser, _("Can't convert %s=\"%s\" to an integer"), attribute->name, value); - ret = xmalloc (sizeof (result)); + ret = XNEW (ULONGEST); memcpy (ret, &result, sizeof (result)); return ret; } @@ -708,10 +690,12 @@ gdb_xml_parse_attr_enum (struct gdb_xml_parser *parser, const struct gdb_xml_attribute *attribute, const char *value) { - const struct gdb_xml_enum *enums = attribute->handler_data; + const struct gdb_xml_enum *enums + = (const struct gdb_xml_enum *) attribute->handler_data; void *ret; - for (enums = attribute->handler_data; enums->name != NULL; enums++) + for (enums = (const struct gdb_xml_enum *) attribute->handler_data; + enums->name != NULL; enums++) if (strcasecmp (enums->name, value) == 0) break; @@ -773,8 +757,9 @@ xinclude_start_include (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct xinclude_parsing_data *data = user_data; - char *href = xml_find_attribute (attributes, "href")->value; + struct xinclude_parsing_data *data + = (struct xinclude_parsing_data *) user_data; + char *href = (char *) xml_find_attribute (attributes, "href")->value; struct cleanup *back_to; char *text, *output; @@ -808,7 +793,8 @@ xinclude_end_include (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - struct xinclude_parsing_data *data = user_data; + struct xinclude_parsing_data *data + = (struct xinclude_parsing_data *) user_data; data->skip_depth--; } @@ -816,8 +802,9 @@ xinclude_end_include (struct gdb_xml_parser *parser, static void XMLCALL xml_xinclude_default (void *data_, const XML_Char *s, int len) { - struct gdb_xml_parser *parser = data_; - struct xinclude_parsing_data *data = parser->user_data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data_; + struct xinclude_parsing_data *data + = (struct xinclude_parsing_data *) parser->user_data; /* If we are inside of e.g. xi:include or the DTD, don't save this string. */ @@ -834,8 +821,9 @@ xml_xinclude_start_doctype (void *data_, const XML_Char *doctypeName, const XML_Char *sysid, const XML_Char *pubid, int has_internal_subset) { - struct gdb_xml_parser *parser = data_; - struct xinclude_parsing_data *data = parser->user_data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data_; + struct xinclude_parsing_data *data + = (struct xinclude_parsing_data *) parser->user_data; /* Don't print out the doctype, or the contents of the DTD internal subset, if any. */ @@ -845,8 +833,9 @@ xml_xinclude_start_doctype (void *data_, const XML_Char *doctypeName, static void XMLCALL xml_xinclude_end_doctype (void *data_) { - struct gdb_xml_parser *parser = data_; - struct xinclude_parsing_data *data = parser->user_data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data_; + struct xinclude_parsing_data *data + = (struct xinclude_parsing_data *) parser->user_data; data->skip_depth--; } @@ -863,7 +852,7 @@ xml_xinclude_xml_decl (void *data_, const XML_Char *version, static void xml_xinclude_cleanup (void *data_) { - struct xinclude_parsing_data *data = data_; + struct xinclude_parsing_data *data = (struct xinclude_parsing_data *) data_; obstack_free (&data->obstack, NULL); xfree (data); @@ -893,11 +882,12 @@ xml_process_xincludes (const char *name, const char *text, struct cleanup *back_to; char *result = NULL; - data = XZALLOC (struct xinclude_parsing_data); + data = XCNEW (struct xinclude_parsing_data); obstack_init (&data->obstack); back_to = make_cleanup (xml_xinclude_cleanup, data); - parser = gdb_xml_create_parser_and_cleanup (name, xinclude_elements, data); + gdb_xml_create_parser_and_cleanup (name, xinclude_elements, + data, &parser); parser->is_xinclude = 1; data->include_depth = depth; @@ -923,7 +913,7 @@ xml_process_xincludes (const char *name, const char *text, if (gdb_xml_parse (parser, text) == 0) { obstack_1grow (&data->obstack, '\0'); - result = xstrdup (obstack_finish (&data->obstack)); + result = xstrdup ((const char *) obstack_finish (&data->obstack)); if (depth == 0) gdb_xml_debug (parser, _("XInclude processing succeeded.")); @@ -990,68 +980,6 @@ show_debug_xml (struct ui_file *file, int from_tty, fprintf_filtered (file, _("XML debugging is %s.\n"), value); } -/* Return a malloc allocated string with special characters from TEXT - replaced by entity references. */ - -char * -xml_escape_text (const char *text) -{ - char *result; - int i, special; - - /* Compute the length of the result. */ - for (i = 0, special = 0; text[i] != '\0'; i++) - switch (text[i]) - { - case '\'': - case '\"': - special += 5; - break; - case '&': - special += 4; - break; - case '<': - case '>': - special += 3; - break; - default: - break; - } - - /* Expand the result. */ - result = xmalloc (i + special + 1); - for (i = 0, special = 0; text[i] != '\0'; i++) - switch (text[i]) - { - case '\'': - strcpy (result + i + special, "'"); - special += 5; - break; - case '\"': - strcpy (result + i + special, """); - special += 5; - break; - case '&': - strcpy (result + i + special, "&"); - special += 4; - break; - case '<': - strcpy (result + i + special, "<"); - special += 3; - break; - case '>': - strcpy (result + i + special, ">"); - special += 3; - break; - default: - result[i + special] = text[i]; - break; - } - result[i + special] = '\0'; - - return result; -} - void obstack_xml_printf (struct obstack *obstack, const char *format, ...) { @@ -1095,7 +1023,7 @@ obstack_xml_printf (struct obstack *obstack, const char *format, ...) char * xml_fetch_content_from_file (const char *filename, void *baton) { - const char *dirname = baton; + const char *dirname = (const char *) baton; FILE *file; struct cleanup *back_to; char *text; @@ -1106,12 +1034,12 @@ xml_fetch_content_from_file (const char *filename, void *baton) char *fullname = concat (dirname, "/", filename, (char *) NULL); if (fullname == NULL) - nomem (0); - file = fopen (fullname, FOPEN_RT); + malloc_failure (0); + file = gdb_fopen_cloexec (fullname, FOPEN_RT); xfree (fullname); } else - file = fopen (filename, FOPEN_RT); + file = gdb_fopen_cloexec (filename, FOPEN_RT); if (file == NULL) return NULL; @@ -1121,7 +1049,7 @@ xml_fetch_content_from_file (const char *filename, void *baton) /* Read in the whole file, one chunk at a time. */ len = 4096; offset = 0; - text = xmalloc (len); + text = (char *) xmalloc (len); make_cleanup (free_current_contents, &text); while (1) { @@ -1143,7 +1071,7 @@ xml_fetch_content_from_file (const char *filename, void *baton) break; len = len * 2; - text = xrealloc (text, len); + text = (char *) xrealloc (text, len); } fclose (file);