diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
| commit | 853da2eb9ba1732b37d3f47319bc94471d9c0e16 (patch) | |
| tree | 94f8afdae71f496fe638550f9e2cea926195b8ee /wiretap/iseries.c | |
| parent | 5cec175b071b85c7cd392350e2fcc246dc20d41d (diff) | |
| download | wireshark-853da2eb9ba1732b37d3f47319bc94471d9c0e16.tar.gz | |
The "file types" we have are actually combinations of types and
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2
are separate "file types", even though they both come from Network
Monitor.
Rename various functions, #defines, and variables appropriately.
svn path=/trunk/; revision=53166
Diffstat (limited to 'wiretap/iseries.c')
| -rw-r--r-- | wiretap/iseries.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/iseries.c b/wiretap/iseries.c index 4136008d03..fafb4393c0 100644 --- a/wiretap/iseries.c +++ b/wiretap/iseries.c @@ -247,7 +247,7 @@ iseries_open (wtap * wth, int *err, gchar ** err_info) } wth->file_encap = WTAP_ENCAP_ETHERNET; - wth->file_type = WTAP_FILE_ISERIES; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_ISERIES; wth->snapshot_length = 0; wth->subtype_read = iseries_read; wth->subtype_seek_read = iseries_seek_read; @@ -287,7 +287,7 @@ iseries_open (wtap * wth, int *err, gchar ** err_info) } wth->file_encap = WTAP_ENCAP_ETHERNET; - wth->file_type = WTAP_FILE_ISERIES; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_ISERIES; wth->snapshot_length = 0; wth->subtype_read = iseries_read; wth->subtype_seek_read = iseries_seek_read; |