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/btsnoop.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/btsnoop.c')
| -rw-r--r-- | wiretap/btsnoop.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c index ce16c2fa6d..784dd9982d 100644 --- a/wiretap/btsnoop.c +++ b/wiretap/btsnoop.c @@ -148,7 +148,7 @@ int btsnoop_open(wtap *wth, int *err, gchar **err_info) wth->file_encap = file_encap; wth->snapshot_length = 0; /* not available in header */ wth->tsprecision = WTAP_FILE_TSPREC_USEC; - wth->file_type = WTAP_FILE_BTSNOOP; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_BTSNOOP; return 1; } @@ -381,9 +381,9 @@ gboolean btsnoop_dump_open_h1(wtap_dumper *wdh, int *err) wdh->subtype_close = NULL; /* Write the file header. */ - switch (wdh->file_type) { + switch (wdh->file_type_subtype) { - case WTAP_FILE_BTSNOOP: + case WTAP_FILE_TYPE_SUBTYPE_BTSNOOP: wdh->tsprecision = WTAP_FILE_TSPREC_USEC; break; @@ -423,9 +423,9 @@ gboolean btsnoop_dump_open_h4(wtap_dumper *wdh, int *err) wdh->subtype_close = NULL; /* Write the file header. */ - switch (wdh->file_type) { + switch (wdh->file_type_subtype) { - case WTAP_FILE_BTSNOOP: + case WTAP_FILE_TYPE_SUBTYPE_BTSNOOP: wdh->tsprecision = WTAP_FILE_TSPREC_USEC; break; |