diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-06-16 00:20:00 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-06-16 00:20:00 +0000 |
| commit | 8c9edf12800bc6d68894dc457e7ebaf994429da8 (patch) | |
| tree | ec6efefbd4e7f8227a7b96661f721ff4ba2986c3 /ui/gtk/main.c | |
| parent | 3846abe34d6861c6ee0bba61fcd5baa4d213885c (diff) | |
Have the seek-read routines take a Buffer rather than a guint8 pointer
as the "where to put the packet data" argument.
This lets more of the libwiretap code be common between the read and
seek-read code paths, and also allows for more flexibility in the "fill
in the data" path - we can expand the buffer as needed in both cases.
svn path=/trunk/; revision=49949
Diffstat (limited to 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 22c0d3de81..981a316be8 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -549,7 +549,8 @@ get_ip_address_list_from_packet_list_row(gpointer data) epan_dissect_init(&edt, FALSE, FALSE); col_custom_prime_edt(&edt, &cfile.cinfo); - epan_dissect_run(&edt, &cfile.phdr, cfile.pd, fdata, &cfile.cinfo); + epan_dissect_run(&edt, &cfile.phdr, buffer_start_ptr(&cfile.buf), + fdata, &cfile.cinfo); epan_dissect_fill_in_columns(&edt, TRUE, TRUE); /* First check selected column */ @@ -589,7 +590,8 @@ get_filter_from_packet_list_row_and_column(gpointer data) epan_dissect_init(&edt, have_custom_cols(&cfile.cinfo), FALSE); col_custom_prime_edt(&edt, &cfile.cinfo); - epan_dissect_run(&edt, &cfile.phdr, cfile.pd, fdata, &cfile.cinfo); + epan_dissect_run(&edt, &cfile.phdr, buffer_start_ptr(&cfile.buf), + fdata, &cfile.cinfo); epan_dissect_fill_in_columns(&edt, TRUE, TRUE); if ((cfile.cinfo.col_custom_occurrence[column]) || |