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 /capinfos.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 'capinfos.c')
| -rw-r--r-- | capinfos.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/capinfos.c b/capinfos.c index 6dfb994d0e..ad20ea5e98 100644 --- a/capinfos.c +++ b/capinfos.c @@ -469,7 +469,7 @@ print_stats(const gchar *filename, capture_info *cf_info) gchar *size_string; /* Build printable strings for various stats */ - file_type_string = wtap_file_type_string(cf_info->file_type); + file_type_string = wtap_file_type_subtype_string(cf_info->file_type); file_encap_string = wtap_encap_string(cf_info->file_encap); start_time_t = (time_t)cf_info->start_time; stop_time_t = (time_t)cf_info->stop_time; @@ -644,7 +644,7 @@ print_stats_table(const gchar *filename, capture_info *cf_info) time_t stop_time_t; /* Build printable strings for various stats */ - file_type_string = wtap_file_type_string(cf_info->file_type); + file_type_string = wtap_file_type_subtype_string(cf_info->file_type); file_encap_string = wtap_encap_string(cf_info->file_encap); start_time_t = (time_t)cf_info->start_time; stop_time_t = (time_t)cf_info->stop_time; @@ -941,7 +941,7 @@ process_cap_file(wtap *wth, const char *filename) cf_info.filesize = size; /* File Type */ - cf_info.file_type = wtap_file_type(wth); + cf_info.file_type = wtap_file_type_subtype(wth); cf_info.iscompressed = wtap_iscompressed(wth); /* File Encapsulation */ |