From 84dcd53b03d15474bebc7431c52aa8029d2b3f97 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 9 Jan 2004 21:38:21 +0000 Subject: [PATCH] We don't need to keep the progress bar quantum or next step in the capture_file structure - just make it local to the routine scanning through the packets. svn path=/trunk/; revision=9616 --- cfile.h | 4 +--- file.c | 54 ++++++++++++++++++++++++++-------------------- proto_hier_stats.c | 12 ++++++----- tethereal.c | 4 +--- 4 files changed, 40 insertions(+), 34 deletions(-) diff --git a/cfile.h b/cfile.h index 040b1fda59..2d0cac446c 100644 --- a/cfile.h +++ b/cfile.h @@ -1,7 +1,7 @@ /* cfile.h * capture_file definition & GUI-independent manipulation * - * $Id: cfile.h,v 1.6 2003/09/24 00:47:36 guy Exp $ + * $Id: cfile.h,v 1.7 2004/01/09 21:38:21 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -59,8 +59,6 @@ typedef struct _capture_file { guint32 eusec; /* Elapsed microseconds */ gboolean has_snap; /* TRUE if maximum capture packet length is known */ int snap; /* Maximum captured packet length */ - long progbar_quantum; /* Number of bytes read per progress bar update */ - long progbar_nextstep; /* Next point at which to update progress bar */ gchar *iface; /* Interface */ gchar *save_file; /* File that user saved capture to */ int save_file_fd; /* File descriptor for saved file */ diff --git a/file.c b/file.c index b0ae738bc9..86245f5f6e 100644 --- a/file.c +++ b/file.c @@ -1,7 +1,7 @@ /* file.c * File I/O routines * - * $Id: file.c,v 1.337 2004/01/09 18:10:40 ulfl Exp $ + * $Id: file.c,v 1.338 2004/01/09 21:38:21 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -197,8 +197,6 @@ cf_open(char *fname, gboolean is_tempfile, capture_file *cf) cf->snap = WTAP_MAX_PACKET_SIZE; } else cf->has_snap = TRUE; - cf->progbar_quantum = 0; - cf->progbar_nextstep = 0; firstsec = 0, firstusec = 0; prevsec = 0, prevusec = 0; @@ -346,6 +344,8 @@ cf_read(capture_file *cf, int *err) struct stat cf_stat; GTimeVal start_time; gchar status_str[100]; + int progbar_nextstep; + int progbar_quantum; cul_bytes=0; reset_tap_listeners(); @@ -358,10 +358,10 @@ cf_read(capture_file *cf, int *err) statusbar_push_file_msg(load_msg); /* Update the progress bar when it gets to this value. */ - cf->progbar_nextstep = 0; + progbar_nextstep = 0; /* When we reach the value that triggers a progress bar update, bump that value by this amount. */ - cf->progbar_quantum = cf->f_len/N_PROGBAR_UPDATES; + progbar_quantum = cf->f_len/N_PROGBAR_UPDATES; #ifndef O_BINARY #define O_BINARY 0 @@ -378,7 +378,7 @@ cf_read(capture_file *cf, int *err) to repaint what's pending, and doing so may involve an "ioctl()" to see if there's any pending input from an X server, and doing that for every packet can be costly, especially on a big file. */ - if (data_offset >= cf->progbar_nextstep) { + if (data_offset >= progbar_nextstep) { file_pos = lseek(cf->filed, 0, SEEK_CUR); prog_val = (gfloat) file_pos / (gfloat) cf->f_len; if (prog_val > 1.0) { @@ -408,7 +408,7 @@ cf_read(capture_file *cf, int *err) "%luKB of %luKB", file_pos / 1024, cf->f_len / 1024); update_progress_dlg(progbar, prog_val, status_str); } - cf->progbar_nextstep += cf->progbar_quantum; + progbar_nextstep += progbar_quantum; } if (stop_flag) { @@ -1019,6 +1019,8 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, float prog_val; GTimeVal start_time; gchar status_str[100]; + int progbar_nextstep; + int progbar_quantum; cul_bytes=0; reset_tap_listeners(); @@ -1062,10 +1064,10 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, prevusec = 0; /* Update the progress bar when it gets to this value. */ - cf->progbar_nextstep = 0; + progbar_nextstep = 0; /* When we reach the value that triggers a progress bar update, bump that value by this amount. */ - cf->progbar_quantum = cf->count/N_PROGBAR_UPDATES; + progbar_quantum = cf->count/N_PROGBAR_UPDATES; /* Count of packets at which we've looked. */ count = 0; @@ -1089,7 +1091,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, to repaint what's pending, and doing so may involve an "ioctl()" to see if there's any pending input from an X server, and doing that for every packet can be costly, especially on a big file. */ - if (count >= cf->progbar_nextstep) { + if (count >= progbar_nextstep) { /* let's not divide by zero. I should never be started * with count == 0, so let's assert that */ @@ -1107,7 +1109,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, update_progress_dlg(progbar, prog_val, status_str); } - cf->progbar_nextstep += cf->progbar_quantum; + progbar_nextstep += progbar_quantum; } if (stop_flag) { @@ -1278,6 +1280,8 @@ print_packets(capture_file *cf, print_args_t *print_args) float prog_val; GTimeVal start_time; gchar status_str[100]; + int progbar_nextstep; + int progbar_quantum; range_process_e process_this; cf->print_fh = open_print_dest(print_args->to_file, print_args->dest); @@ -1339,10 +1343,10 @@ print_packets(capture_file *cf, print_args_t *print_args) print_separator = FALSE; /* Update the progress bar when it gets to this value. */ - cf->progbar_nextstep = 0; + progbar_nextstep = 0; /* When we reach the value that triggers a progress bar update, bump that value by this amount. */ - cf->progbar_quantum = cf->count/N_PROGBAR_UPDATES; + progbar_quantum = cf->count/N_PROGBAR_UPDATES; /* Count of packets at which we've looked. */ count = 0; @@ -1359,7 +1363,7 @@ print_packets(capture_file *cf, print_args_t *print_args) to repaint what's pending, and doing so may involve an "ioctl()" to see if there's any pending input from an X server, and doing that for every packet can be costly, especially on a big file. */ - if (count >= cf->progbar_nextstep) { + if (count >= progbar_nextstep) { /* let's not divide by zero. I should never be started * with count == 0, so let's assert that */ @@ -1377,7 +1381,7 @@ print_packets(capture_file *cf, print_args_t *print_args) update_progress_dlg(progbar, prog_val, status_str); } - cf->progbar_nextstep += cf->progbar_quantum; + progbar_nextstep += progbar_quantum; } if (stop_flag) { @@ -1501,6 +1505,8 @@ change_time_formats(capture_file *cf) float prog_val; GTimeVal start_time; gchar status_str[100]; + int progbar_nextstep; + int progbar_quantum; int first, last; gboolean sorted_by_frame_column; @@ -1524,10 +1530,10 @@ change_time_formats(capture_file *cf) packet_list_freeze(); /* Update the progress bar when it gets to this value. */ - cf->progbar_nextstep = 0; + progbar_nextstep = 0; /* When we reach the value that triggers a progress bar update, bump that value by this amount. */ - cf->progbar_quantum = cf->count/N_PROGBAR_UPDATES; + progbar_quantum = cf->count/N_PROGBAR_UPDATES; /* Count of packets at which we've looked. */ count = 0; @@ -1565,7 +1571,7 @@ change_time_formats(capture_file *cf) to repaint what's pending, and doing so may involve an "ioctl()" to see if there's any pending input from an X server, and doing that for every packet can be costly, especially on a big file. */ - if (count >= cf->progbar_nextstep) { + if (count >= progbar_nextstep) { /* let's not divide by zero. I should never be started * with count == 0, so let's assert that */ @@ -1584,7 +1590,7 @@ change_time_formats(capture_file *cf) update_progress_dlg(progbar, prog_val, status_str); } - cf->progbar_nextstep += cf->progbar_quantum; + progbar_nextstep += progbar_quantum; } if (stop_flag) { @@ -1984,6 +1990,8 @@ find_packet(capture_file *cf, float prog_val; GTimeVal start_time; gchar status_str[100]; + int progbar_nextstep; + int progbar_quantum; start_fd = cf->current_frame; if (start_fd != NULL) { @@ -1993,10 +2001,10 @@ find_packet(capture_file *cf, count = 0; fdata = start_fd; - cf->progbar_nextstep = 0; + progbar_nextstep = 0; /* When we reach the value that triggers a progress bar update, bump that value by this amount. */ - cf->progbar_quantum = cf->count/N_PROGBAR_UPDATES; + progbar_quantum = cf->count/N_PROGBAR_UPDATES; stop_flag = FALSE; g_get_current_time(&start_time); @@ -2008,7 +2016,7 @@ find_packet(capture_file *cf, to repaint what's pending, and doing so may involve an "ioctl()" to see if there's any pending input from an X server, and doing that for every packet can be costly, especially on a big file. */ - if (count >= cf->progbar_nextstep) { + if (count >= progbar_nextstep) { /* let's not divide by zero. I should never be started * with count == 0, so let's assert that */ @@ -2027,7 +2035,7 @@ find_packet(capture_file *cf, update_progress_dlg(progbar, prog_val, status_str); } - cf->progbar_nextstep += cf->progbar_quantum; + progbar_nextstep += progbar_quantum; } if (stop_flag) { diff --git a/proto_hier_stats.c b/proto_hier_stats.c index 641ee0d24c..5a3346a09b 100644 --- a/proto_hier_stats.c +++ b/proto_hier_stats.c @@ -1,7 +1,7 @@ /* proto_hier_stats.c * Routines for calculating statistics based on protocol. * - * $Id: proto_hier_stats.c,v 1.20 2003/12/04 10:59:33 guy Exp $ + * $Id: proto_hier_stats.c,v 1.21 2004/01/09 21:38:21 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -164,6 +164,8 @@ ph_stats_new(void) float prog_val; GTimeVal start_time; gchar status_str[100]; + int progbar_nextstep; + int progbar_quantum; /* Initialize the data */ ps = g_new(ph_stats_t, 1); @@ -172,10 +174,10 @@ ph_stats_new(void) ps->stats_tree = g_node_new(NULL); /* Update the progress bar when it gets to this value. */ - cfile.progbar_nextstep = 0; + progbar_nextstep = 0; /* When we reach the value that triggers a progress bar update, bump that value by this amount. */ - cfile.progbar_quantum = cfile.count/N_PROGBAR_UPDATES; + progbar_quantum = cfile.count/N_PROGBAR_UPDATES; /* Count of packets at which we've looked. */ count = 0; @@ -192,7 +194,7 @@ ph_stats_new(void) may involve an "ioctl()" to see if there's any pending input from an X server, and doing that for every packet can be costly, especially on a big file. */ - if (count >= cfile.progbar_nextstep) { + if (count >= progbar_nextstep) { /* let's not divide by zero. I should never be started * with count == 0, so let's assert that */ @@ -212,7 +214,7 @@ ph_stats_new(void) update_progress_dlg(progbar, prog_val, status_str); } - cfile.progbar_nextstep += cfile.progbar_quantum; + progbar_nextstep += progbar_quantum; } if (stop_flag) { diff --git a/tethereal.c b/tethereal.c index 26e4b7ce24..9581fbe1f0 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.215 2004/01/09 19:02:18 ulfl Exp $ + * $Id: tethereal.c,v 1.216 2004/01/09 21:38:21 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -2927,8 +2927,6 @@ cf_open(char *fname, gboolean is_tempfile, capture_file *cf) cf->snap = WTAP_MAX_PACKET_SIZE; } else cf->has_snap = TRUE; - cf->progbar_quantum = 0; - cf->progbar_nextstep = 0; firstsec = 0, firstusec = 0; prevsec = 0, prevusec = 0;