diff options
| -rw-r--r-- | epan/dissectors/packet-xml.c | 5 | ||||
| -rw-r--r-- | epan/dtd.h | 1 | ||||
| -rw-r--r-- | epan/dtd_grammar.lemon | 2 | ||||
| -rw-r--r-- | epan/dtd_parse.l | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index 2015146a4d..d5f186a61a 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -650,9 +650,8 @@ static void destroy_dtd_data(dtd_build_data_t* dtd_data) { if(dtd_data->media_type) g_free(dtd_data->media_type); if(dtd_data->description) g_free(dtd_data->description); if(dtd_data->proto_root) g_free(dtd_data->proto_root); - - if(dtd_data->location) g_free(dtd_data->location); - g_string_free(dtd_data->error,TRUE); + + g_string_free(dtd_data->error,TRUE); while(dtd_data->elements->len) { diff --git a/epan/dtd.h b/epan/dtd.h index 884a713bc0..2b76f818de 100644 --- a/epan/dtd.h +++ b/epan/dtd.h @@ -42,7 +42,6 @@ typedef struct _dtd_build_data_t { GPtrArray* elements; GPtrArray* attributes; - gchar* location; GString* error; } dtd_build_data_t; diff --git a/epan/dtd_grammar.lemon b/epan/dtd_grammar.lemon index 997c14d517..c743d626ff 100644 --- a/epan/dtd_grammar.lemon +++ b/epan/dtd_grammar.lemon @@ -74,7 +74,7 @@ static GPtrArray* g_ptr_array_join(GPtrArray* a, GPtrArray* b){ } %parse_failure { - g_string_sprintfa(bd->error,"DTD parsing failure at %s\n",bd->location); + g_string_sprintfa(bd->error,"DTD parsing failure\n"); } %token_prefix TOKEN_ diff --git a/epan/dtd_parse.l b/epan/dtd_parse.l index 545242d497..d2e5380f23 100644 --- a/epan/dtd_parse.l +++ b/epan/dtd_parse.l @@ -82,7 +82,6 @@ #define DTD_PARSE(token_type) \ { DEBUG_DTD_TOKEN; \ - build_data->location = location; \ DtdParse(pParser, (token_type), new_token(yytext), build_data); \ if(build_data->error->len > 0) yyterminate(); \ } @@ -326,7 +325,6 @@ extern dtd_build_data_t* dtd_parse(GString* s) { build_data->elements = g_ptr_array_new(); build_data->attributes = g_ptr_array_new(); - build_data->location = NULL; build_data->error = g_string_new(""); location = NULL; |