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/erf.c | |
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/erf.c')
-rw-r--r-- | wiretap/erf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/erf.c b/wiretap/erf.c index 9297e8fc93..6e7c782b00 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -265,7 +265,7 @@ extern int erf_open(wtap *wth, int *err, gchar **err_info) } /* This is an ERF file */ - wth->file_type = WTAP_FILE_ERF; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_ERF; wth->snapshot_length = 0; /* not available in header, only in frame */ /* @@ -702,8 +702,8 @@ int erf_dump_open(wtap_dumper *wdh, int *err) wdh->subtype_write = erf_dump; wdh->subtype_close = NULL; - switch(wdh->file_type){ - case WTAP_FILE_ERF: + switch(wdh->file_type_subtype){ + case WTAP_FILE_TYPE_SUBTYPE_ERF: wdh->tsprecision = WTAP_FILE_TSPREC_NSEC; break; default: |