bd7bf7f8c2
fix bnc#697516 OBS-URL: https://build.opensuse.org/request/show/76454 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=42
30 lines
728 B
Diff
30 lines
728 B
Diff
--- trunk/epan/diam_dict.l 2011/05/06 15:05:51 37010
|
|
+++ trunk/epan/diam_dict.l 2011/05/06 19:39:47 37011
|
|
@@ -269,9 +269,6 @@
|
|
yyterminate();
|
|
}
|
|
|
|
- include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
|
|
-
|
|
-
|
|
for (e = ents.next; e; e = e->next) {
|
|
if (strcmp(e->name,yytext) == 0) {
|
|
yyin = ddict_open(sys_dir,e->file);
|
|
@@ -282,6 +279,7 @@
|
|
yyterminate();
|
|
}
|
|
} else {
|
|
+ include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
|
|
yy_switch_to_buffer(yy_create_buffer( yyin, YY_BUF_SIZE ) );
|
|
BEGIN LOADING;
|
|
}
|
|
@@ -290,7 +288,7 @@
|
|
}
|
|
|
|
if (!e) {
|
|
- fprintf(stderr, "Could not find entity: '%s'", e->name );
|
|
+ fprintf(stderr, "Could not find entity: '%s'\n", yytext );
|
|
yyterminate();
|
|
}
|
|
|