diff options
| -rw-r--r-- | column.c | 8 | ||||
| -rw-r--r-- | epan/column-utils.c | 7 | ||||
| -rw-r--r-- | epan/column_info.h | 4 | ||||
| -rw-r--r-- | epan/frame_data.h | 4 | ||||
| -rw-r--r-- | file.c | 18 | ||||
| -rw-r--r-- | gtk/packet_list.c | 7 | ||||
| -rw-r--r-- | tethereal.c | 8 |
7 files changed, 28 insertions, 28 deletions
@@ -1,7 +1,7 @@ /* column.c * Routines for handling column preferences * - * $Id: column.c,v 1.45 2004/01/19 03:46:41 ulfl Exp $ + * $Id: column.c,v 1.46 2004/01/31 04:10:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -97,7 +97,7 @@ static gchar *dlist[NUM_COL_FMTS] = { "Protocol", "Information", "Packet length (bytes)" , - "Culmulative Bytes" , + "Cumulative Bytes" , "OXID", "RXID", "FW-1 monitor if/direction", @@ -263,7 +263,7 @@ get_column_longest_string(gint format) case COL_PACKET_LENGTH: return "000000"; break; - case COL_CULMULATIVE_BYTES: + case COL_CUMULATIVE_BYTES: return "00000000"; break; case COL_RXID: @@ -397,7 +397,7 @@ get_column_format_from_str(gchar *str) { return COL_PACKET_LENGTH; break; case 'B': - return COL_CULMULATIVE_BYTES; + return COL_CUMULATIVE_BYTES; break; case 'X': prev_code = COL_OXID; diff --git a/epan/column-utils.c b/epan/column-utils.c index c94281f89d..3e8901a608 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1,7 +1,7 @@ /* column-utils.c * Routines for column utilities. * - * $Id: column-utils.c,v 1.43 2004/01/29 03:37:31 guy Exp $ + * $Id: column-utils.c,v 1.44 2004/01/31 04:10:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -875,8 +875,9 @@ fill_in_columns(packet_info *pinfo) strcpy(pinfo->cinfo->col_expr[i], "frame.pkt_len"); strcpy(pinfo->cinfo->col_expr_val[i], pinfo->cinfo->col_buf[i]); break; - case COL_CULMULATIVE_BYTES: - snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "%u", pinfo->fd->cul_bytes); + + case COL_CUMULATIVE_BYTES: + snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "%u", pinfo->fd->cum_bytes); pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i]; break; diff --git a/epan/column_info.h b/epan/column_info.h index 790211c556..51b6661b6a 100644 --- a/epan/column_info.h +++ b/epan/column_info.h @@ -1,7 +1,7 @@ /* column.h * Definitions for column structures and routines * - * $Id: column_info.h,v 1.11 2003/12/09 06:48:39 guy Exp $ + * $Id: column_info.h,v 1.12 2004/01/31 04:10:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -85,7 +85,7 @@ enum { COL_PROTOCOL, /* Protocol */ COL_INFO, /* Description */ COL_PACKET_LENGTH, /* Packet length in bytes */ - COL_CULMULATIVE_BYTES, /* Culmulative number of bytes */ + COL_CUMULATIVE_BYTES, /* Cumulative number of bytes */ COL_OXID, /* Fibre Channel OXID */ COL_RXID, /* Fibre Channel RXID */ COL_IF_DIR, /* FW-1 monitor interface/direction */ diff --git a/epan/frame_data.h b/epan/frame_data.h index 21faaaab1e..d45a820c3b 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -1,7 +1,7 @@ /* frame_data.h * Definitions for frame_data structures and routines * - * $Id: frame_data.h,v 1.12 2004/01/10 13:15:41 jmayer Exp $ + * $Id: frame_data.h,v 1.13 2004/01/31 04:10:05 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -50,7 +50,7 @@ typedef struct _frame_data { guint32 num; /* Frame number */ guint32 pkt_len; /* Packet length */ guint32 cap_len; /* Amount actually captured */ - guint32 cul_bytes; /* Culmulative bytes into the capture */ + guint32 cum_bytes; /* Cumulative bytes into the capture */ gint32 rel_secs; /* Relative seconds (yes, it can be negative) */ gint32 rel_usecs; /* Relative microseconds (yes, it can be negative) */ guint32 abs_secs; /* Absolute seconds */ @@ -1,7 +1,7 @@ /* file.c * File I/O routines * - * $Id: file.c,v 1.353 2004/01/31 03:22:37 guy Exp $ + * $Id: file.c,v 1.354 2004/01/31 04:10:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -89,7 +89,7 @@ gboolean auto_scroll_live; static guint32 firstsec, firstusec; static guint32 prevsec, prevusec; -static guint32 cul_bytes = 0; +static guint32 cum_bytes = 0; static void read_packet(capture_file *cf, long offset); @@ -353,7 +353,7 @@ cf_read(capture_file *cf) int progbar_nextstep; int progbar_quantum; - cul_bytes=0; + cum_bytes=0; reset_tap_listeners(); tap_dfilter_dlg_update(); name_ptr = get_basename(cf->filename); @@ -707,7 +707,7 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf, epan_dissect_t *edt; /* just add some value here until we know if it is being displayed or not */ - fdata->cul_bytes = cul_bytes + fdata->pkt_len; + fdata->cum_bytes = cum_bytes + fdata->pkt_len; /* We don't yet have a color filter to apply. */ args.colorf = NULL; @@ -812,12 +812,12 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf, even if they dont pass the display filter */ /* if this was a TIME REF frame we should reset the cul bytes field */ if(edt->pi.fd->flags.ref_time){ - cul_bytes = fdata->pkt_len; - fdata->cul_bytes = cul_bytes; + cum_bytes = fdata->pkt_len; + fdata->cum_bytes = cum_bytes; } - /* increase cul_bytes with this packets length */ - cul_bytes += fdata->pkt_len; + /* increase cum_bytes with this packets length */ + cum_bytes += fdata->pkt_len; epan_dissect_fill_in_columns(edt); @@ -1043,7 +1043,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, int progbar_nextstep; int progbar_quantum; - cul_bytes=0; + cum_bytes=0; reset_tap_listeners(); /* Which frame, if any, is the currently selected frame? XXX - should the selected frame or the focus frame be the "current" diff --git a/gtk/packet_list.c b/gtk/packet_list.c index 4717586afb..9f816f6073 100644 --- a/gtk/packet_list.c +++ b/gtk/packet_list.c @@ -1,7 +1,7 @@ /* packet_list.c * packet list related functions 2002 Olivier Abad * - * $Id: packet_list.c,v 1.14 2004/01/28 10:37:14 guy Exp $ + * $Id: packet_list.c,v 1.15 2004/01/31 04:10:05 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -182,12 +182,11 @@ packet_list_compare(EthCList *clist, gconstpointer ptr1, gconstpointer ptr2) fdata2->flags.ref_time, fdata2->del_secs, fdata2->del_usecs); - case COL_PACKET_LENGTH: return COMPARE_NUM(fdata1->pkt_len, fdata2->pkt_len); - case COL_CULMULATIVE_BYTES: - return COMPARE_NUM(fdata1->cul_bytes, fdata2->cul_bytes); + case COL_CUMULATIVE_BYTES: + return COMPARE_NUM(fdata1->cum_bytes, fdata2->cum_bytes); default: num1 = atof(text1); diff --git a/tethereal.c b/tethereal.c index 348325e135..9225de5dbf 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.227 2004/01/25 21:55:10 guy Exp $ + * $Id: tethereal.c,v 1.228 2004/01/31 04:10:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -119,7 +119,7 @@ static gboolean decode; static gboolean verbose; static gboolean print_hex; static gboolean line_buffered; -static guint32 cul_bytes = 0; +static guint32 cum_bytes = 0; static int print_format; #ifdef HAVE_LIBPCAP @@ -2344,8 +2344,8 @@ fill_in_fdata(frame_data *fdata, capture_file *cf, fdata->pfd = NULL; fdata->num = cf->count; fdata->pkt_len = phdr->len; - cul_bytes += phdr->len; - fdata->cul_bytes = cul_bytes; + cum_bytes += phdr->len; + fdata->cum_bytes = cum_bytes; fdata->cap_len = phdr->caplen; fdata->file_off = offset; fdata->lnk_t = phdr->pkt_encap; |