aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/wtap.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-11-08 09:53:01 +0000
committerGuy Harris <guy@alum.mit.edu>2013-11-08 09:53:01 +0000
commit853da2eb9ba1732b37d3f47319bc94471d9c0e16 (patch)
tree94f8afdae71f496fe638550f9e2cea926195b8ee /wiretap/wtap.c
parent5cec175b071b85c7cd392350e2fcc246dc20d41d (diff)
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/wtap.c')
-rw-r--r--wiretap/wtap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 181a110711..bf9981a84c 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -71,9 +71,9 @@ wtap_fstat(wtap *wth, ws_statb64 *statb, int *err)
}
int
-wtap_file_type(wtap *wth)
+wtap_file_type_subtype(wtap *wth)
{
- return wth->file_type;
+ return wth->file_type_subtype;
}
gboolean