diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-03-20 00:01:46 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-03-20 07:27:25 +0000 |
| commit | c01ace71efae9ccd2d59a3ab483cd31d7617177b (patch) | |
| tree | 190e6479b1af034b8b0473d77b34ae17e79605c6 /ui/text_import.c | |
| parent | df737b2b35a12ff75641bdde42808544f7bd2b14 (diff) | |
Write out the last packet in text_import().
Write out the last packet after text_import_scan() returns, if it
returned successfully, the same way that it's done in text2pcap. This
means we can get rid of the EOF rule in the lexer - the lexer just
finishes and returns 0 to text_import_scan(), which then returns a
success indication to text_import() - and make write_current_packet()
static.
Change-Id: Ibafdbe01da6bb33a213a32847f1981bc943290a1
Reviewed-on: https://code.wireshark.org/review/32486
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/text_import.c')
| -rw-r--r-- | ui/text_import.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/text_import.c b/ui/text_import.c index 186a95648a..da67324423 100644 --- a/ui/text_import.c +++ b/ui/text_import.c @@ -384,7 +384,7 @@ number_of_padding_bytes (guint32 length) /*---------------------------------------------------------------------- * Write current packet out */ -void +static void write_current_packet (void) { int prefix_length = 0; @@ -1117,6 +1117,9 @@ text_import(text_import_info_t *info) max_offset = info->max_frame_length; ret = text_import_scan(info->import_text_file); + if (ret == 0) { + write_current_packet(); + } g_free(packet_buf); return ret; } |