From 853da2eb9ba1732b37d3f47319bc94471d9c0e16 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 8 Nov 2013 09:53:01 +0000 Subject: 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 --- wiretap/peekclassic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wiretap/peekclassic.c') 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; -- cgit v1.2.1