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/ipfix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wiretap/ipfix.c') diff --git a/wiretap/ipfix.c b/wiretap/ipfix.c index fbba7db7fe..53ffa032e7 100644 --- a/wiretap/ipfix.c +++ b/wiretap/ipfix.c @@ -271,7 +271,7 @@ ipfix_open(wtap *wth, int *err, gchar **err_info) wth->subtype_read = ipfix_read; wth->subtype_seek_read = ipfix_seek_read; wth->subtype_close = ipfix_close; - wth->file_type = WTAP_FILE_IPFIX; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_IPFIX; /* go back to beginning of file */ if (file_seek (wth->fh, 0, SEEK_SET, err) != 0) -- cgit v1.2.3