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/k12text.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wiretap/k12text.l') 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; } -- cgit v1.2.1