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/iptrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wiretap/iptrace.c') diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index 5d3ea6b6fa..4e5e8d4905 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -69,13 +69,13 @@ int iptrace_open(wtap *wth, int *err, gchar **err_info) name[11] = '\0'; if (strcmp(name, "iptrace 1.0") == 0) { - wth->file_type = WTAP_FILE_IPTRACE_1_0; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_IPTRACE_1_0; wth->subtype_read = iptrace_read_1_0; wth->subtype_seek_read = iptrace_seek_read_1_0; wth->tsprecision = WTAP_FILE_TSPREC_SEC; } else if (strcmp(name, "iptrace 2.0") == 0) { - wth->file_type = WTAP_FILE_IPTRACE_2_0; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_IPTRACE_2_0; wth->subtype_read = iptrace_read_2_0; wth->subtype_seek_read = iptrace_seek_read_2_0; wth->tsprecision = WTAP_FILE_TSPREC_NSEC; -- cgit v1.2.1