diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2014-05-15 23:39:12 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-05-17 12:41:50 +0000 |
| commit | 3aee917058fb46b2e86d750766001c4db214fc78 (patch) | |
| tree | ab3cf638836b2dd9c1fc53e90c01cefe129989ae /file.c | |
| parent | 9fe221a42f6085d6345a5ee6b5deb47d93b264de (diff) | |
wiretap: remove unused code, drop number_of_interfaces
While investigating an ASAN issue (fixed in
commit dcdd076ab0965c346efe90051678ba790eaf7a02), I got greatly confused
by three different types having the same "interface_data" field name:
* pcapng_t *pn stores an array of interface_data_t objects.
* wtap *wth stores an array of wtapng_if_descr_t objects.
* pcapng_dump_t should store an array of interface_data_t objects.
pcapng_dump_t and friends are unused since
commit c7f1a431d23e17a15777652b1252e139f182b0e6, so drop it.
To fix the confusion, rename the interface_data_t type to
interface_info_t type and use the local variable "iface_info"
everywhere. Rename interface_data of pcapng_t to "interfaces" and
add a comment what this exactly means (interfaces listed in the capture
file).
Drop the number_of_interfaces field for interfaces as the array
length is already available from GArray. Now interface_data is always
initialized for wth (which also gets copied to idb).
s/int/guint/g and replace cast at some places.
There are no regressions for the in-tree test suite.
Change-Id: I2d5985c9f1e43f8230dbb4a73bd1e243c4858170
Reviewed-on: https://code.wireshark.org/review/1656
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1382,9 +1382,9 @@ cf_merge_files(char **out_filenamep, int in_file_count, /* create fake IDB info */ idb_inf = g_new(wtapng_iface_descriptions_t,1); - idb_inf->number_of_interfaces = in_file_count; /* TODO make this the number of DIFFERENT encapsulation types - * check that snaplength is the same too? - */ + /* TODO make this the number of DIFFERENT encapsulation types + * check that snaplength is the same too? + */ idb_inf->interface_data = g_array_new(FALSE, FALSE, sizeof(wtapng_if_descr_t)); for (i = 0; i < in_file_count; i++) { |