diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-04-23 01:29:23 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-04-23 08:29:55 +0000 |
commit | dc9127ddff6081ab3a7e7480621405119ad38d95 (patch) | |
tree | da7cf8bdaec70a525b068cca74112acd566387cb /tshark.c | |
parent | e9f5e045f743fd3220f1c8d9ba68214f1feb7359 (diff) | |
download | wireshark-dc9127ddff6081ab3a7e7480621405119ad38d95.tar.gz wireshark-dc9127ddff6081ab3a7e7480621405119ad38d95.tar.bz2 wireshark-dc9127ddff6081ab3a7e7480621405119ad38d95.zip |
Rename read{_cap}_file() to process{_cap+_file().
They might read the file once or twice, but the key is that they (and
what they call) are doing the work of processing the file's contents.
Change-Id: I2df6257c55ff5ace944f1a1db5e2aec456ed2038
Reviewed-on: https://code.wireshark.org/review/21293
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tshark.c')
-rw-r--r-- | tshark.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -228,7 +228,7 @@ static char *output_file_name; #endif /* HAVE_LIBPCAP */ -static gboolean read_cap_file(capture_file *, char *, int, gboolean, int, gint64); +static gboolean process_cap_file(capture_file *, char *, int, gboolean, int, gint64); static gboolean process_packet_single_pass(capture_file *cf, epan_dissect_t *edt, gint64 offset, struct wtap_pkthdr *whdr, const guchar *pd, guint tap_flags); @@ -1949,14 +1949,14 @@ main(int argc, char *argv[]) } /* Process the packets in the file */ - tshark_debug("tshark: invoking read_cap_file() to process the packets"); + tshark_debug("tshark: invoking process_cap_file() to process the packets"); TRY { #ifdef HAVE_LIBPCAP - success = read_cap_file(&cfile, global_capture_opts.save_file, out_file_type, out_file_name_res, + success = process_cap_file(&cfile, global_capture_opts.save_file, out_file_type, out_file_name_res, global_capture_opts.has_autostop_packets ? global_capture_opts.autostop_packets : 0, global_capture_opts.has_autostop_filesize ? global_capture_opts.autostop_filesize : 0); #else - success = read_cap_file(&cfile, output_file_name, out_file_type, out_file_name_res, 0, 0); + success = process_cap_file(&cfile, output_file_name, out_file_type, out_file_name_res, 0, 0); #endif } CATCH(OutOfMemoryError) { @@ -2943,7 +2943,7 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt, } static gboolean -read_cap_file(capture_file *cf, char *save_file, int out_file_type, +process_cap_file(capture_file *cf, char *save_file, int out_file_type, gboolean out_file_name_res, int max_packet_count, gint64 max_byte_count) { gint linktype; |