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/peekclassic.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/peekclassic.c')
| -rw-r--r-- | wiretap/peekclassic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c index 471e5ee693..f516775d47 100644 --- a/wiretap/peekclassic.c +++ b/wiretap/peekclassic.c @@ -334,7 +334,7 @@ int peekclassic_open(wtap *wth, int *err, gchar **err_info) case 5: case 6: - wth->file_type = WTAP_FILE_PEEKCLASSIC_V56; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_PEEKCLASSIC_V56; /* * XXX - can we get the file encapsulation from the * header in the same way we do for V7 files? @@ -345,7 +345,7 @@ int peekclassic_open(wtap *wth, int *err, gchar **err_info) break; case 7: - wth->file_type = WTAP_FILE_PEEKCLASSIC_V7; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_PEEKCLASSIC_V7; wth->file_encap = file_encap; wth->subtype_read = peekclassic_read_v7; wth->subtype_seek_read = peekclassic_seek_read_v7; |