From 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 8 May 2014 22:59:19 -0400 Subject: Refactor Wiretap Start of refactoring Wiretap and breaking structures down into "generally useful fields for dissection" and "capture specific". Since this in intended as a "base" for Wiretap and Filetap, the "wft" prefix is used for "common" functionality. The "architectural" changes can be found in cfile.h, wtap.h, wtap-int.h and (new file) wftap-int.h. Most of the other (painstaking) changes were really just the result of compiling those new architecture changes. bug:9607 Change-Id: Ife858a61760d7a8a03be073546c0e7e582cab2ae Reviewed-on: https://code.wireshark.org/review/1485 Reviewed-by: Michael Mann --- captype.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'captype.c') diff --git a/captype.c b/captype.c index 3062fb1122..1c4528e27b 100644 --- a/captype.c +++ b/captype.c @@ -91,7 +91,7 @@ failure_message(const char *msg_format _U_, va_list ap _U_) int main(int argc, char *argv[]) { - wtap *wth; + wftap *wth; int err; gchar *err_info; int i; @@ -145,8 +145,8 @@ main(int argc, char *argv[]) wth = wtap_open_offline(argv[i], WTAP_TYPE_AUTO, &err, &err_info, FALSE); if(wth) { - printf("%s: %s\n", argv[i], wtap_file_type_subtype_short_string(wtap_file_type_subtype(wth))); - wtap_close(wth); + printf("%s: %s\n", argv[i], wtap_file_type_subtype_short_string(wftap_file_type_subtype(wth))); + wftap_close(wth); } else { if (err == WTAP_ERR_FILE_UNKNOWN_FORMAT) printf("%s: unknown\n", argv[i]); -- cgit v1.2.3