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 | |
parent | e9f5e045f743fd3220f1c8d9ba68214f1feb7359 (diff) |
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>
-rw-r--r-- | tfshark.c | 6 | ||||
-rw-r--r-- | tshark.c | 10 |
2 files changed, 8 insertions, 8 deletions
@@ -136,7 +136,7 @@ static output_fields_t* output_fields = NULL; /* The line separator used between packets, changeable via the -S option */ static const char *separator = ""; -static gboolean read_file(capture_file *, int, gint64); +static gboolean process_file(capture_file *, 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); @@ -982,7 +982,7 @@ main(int argc, char *argv[]) /* Process the packets in the file */ TRY { /* XXX - for now there is only 1 packet */ - success = read_file(&cfile, 1, 0); + success = process_file(&cfile, 1, 0); } CATCH(OutOfMemoryError) { fprintf(stderr, @@ -1296,7 +1296,7 @@ local_wtap_read(capture_file *cf, struct wtap_pkthdr* file_phdr _U_, int *err, g } static gboolean -read_file(capture_file *cf, int max_packet_count, gint64 max_byte_count) +process_file(capture_file *cf, int max_packet_count, gint64 max_byte_count) { guint32 framenum; int err; @@ -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; |