diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-11-21 23:16:26 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-11-21 23:16:26 +0000 |
| commit | 8743a4a8a7613095d833e380744a358b7074b0c8 (patch) | |
| tree | fdf1228846948ec5e1c08b7b50f1d81d1f379ffc /tethereal.c | |
| parent | bd90493d46399161487bb21997af3e6450c5425d (diff) | |
Remove the global packet_info called "pi". Dissectors now only
access their own "pinfo". A packet_info is stored in epan_dissect_t,
which is created for the dissection of a single packet.
GUI functions which need to access the packet_info of the currently
selected packet used to use "pi"; now they use cfile.edt->pi. cfile's
"edt" member is the epan_dissect_t of the currently-selected packet.
The functionality of blank_packetinfo() was moved into
dissect_packet(), as that's the only place that called blank_packetinfo(),
after a spurious call to blank_packetinfo() was removed from
packet_list_select_cb().
svn path=/trunk/; revision=4246
Diffstat (limited to 'tethereal.c')
| -rw-r--r-- | tethereal.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tethereal.c b/tethereal.c index 26e6a3453c..66dbe5c8bb 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.98 2001/11/13 23:55:30 gram Exp $ + * $Id: tethereal.c,v 1.99 2001/11/21 23:16:21 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -143,7 +143,6 @@ static void show_capture_file_io_error(const char *, int, gboolean); static void wtap_dispatch_cb_print(u_char *, const struct wtap_pkthdr *, long, union wtap_pseudo_header *, const u_char *); -packet_info pi; capture_file cfile; FILE *data_out_file = NULL; ts_type timestamp_type = RELATIVE; @@ -1213,7 +1212,7 @@ wtap_dispatch_cb_print(u_char *user, const struct wtap_pkthdr *phdr, } } else { /* Just fill in the columns. */ - fill_in_columns(&fdata); + fill_in_columns(&fdata, &edt->pi); /* Now print them. */ for (i = 0; i < cf->cinfo.num_cols; i++) { |