diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
| commit | 853da2eb9ba1732b37d3f47319bc94471d9c0e16 (patch) | |
| tree | 94f8afdae71f496fe638550f9e2cea926195b8ee /wiretap/wtap-int.h | |
| parent | 5cec175b071b85c7cd392350e2fcc246dc20d41d (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-int.h')
| -rw-r--r-- | wiretap/wtap-int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h index 056b0fe1e9..2477ec7007 100644 --- a/wiretap/wtap-int.h +++ b/wiretap/wtap-int.h @@ -52,7 +52,7 @@ typedef gboolean (*subtype_seek_read_func)(struct wtap*, gint64, struct wtap { FILE_T fh; FILE_T random_fh; /**< Secondary FILE_T for random access */ - int file_type; + int file_type_subtype; guint snapshot_length; struct Buffer *frame_buffer; struct wtap_pkthdr phdr; @@ -93,7 +93,7 @@ typedef gboolean (*subtype_close_func)(struct wtap_dumper*, int*); struct wtap_dumper { WFILE_T fh; - int file_type; + int file_type_subtype; int snaplen; int encap; gboolean compressed; |