summaryrefslogtreecommitdiff
path: root/wiretap/k12text.l
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/k12text.l
parent5cec175b071b85c7cd392350e2fcc246dc20d41d (diff)
downloadwireshark-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/k12text.l')
-rw-r--r--wiretap/k12text.l4
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/k12text.l b/wiretap/k12text.l
index 7e28f781b5..24cc279e90 100644
--- a/wiretap/k12text.l
+++ b/wiretap/k12text.l
@@ -347,12 +347,12 @@ k12text_open(wtap *wth, int *err, gchar **err_info _U_)
k12text = (k12text_t *)g_malloc(sizeof(k12text_t));
wth->priv = (void *)k12text;
k12text->next_frame_offset = 0;
- wth->file_type = WTAP_FILE_K12TEXT;
+ wth->file_type = WTAP_FILE_TYPE_SUBTYPE_K12TEXT;
wth->file_encap = WTAP_ENCAP_PER_PACKET;
wth->snapshot_length = 0;
wth->subtype_read = k12text_read;
wth->subtype_seek_read = k12text_seek_read;
- wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
+ wth->tsprecision = WTAP_FILE_TYPE_SUBTYPE_TSPREC_NSEC;
return 1;
}