aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--file.c3
-rw-r--r--file.h3
-rw-r--r--summary.c5
3 files changed, 5 insertions, 6 deletions
diff --git a/file.c b/file.c
index e018868711..fc3b8c1b68 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
/* file.c
* File I/O routines
*
- * $Id: file.c,v 1.132 1999/12/04 08:51:41 guy Exp $
+ * $Id: file.c,v 1.133 1999/12/04 08:59:12 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -163,7 +163,6 @@ open_cap_file(char *fname, gboolean is_tempfile, capture_file *cf)
cf->user_saved = !is_tempfile;
cf->cd_t = wtap_file_type(cf->wth);
- cf->cd_t_desc = wtap_file_type_string(cf->cd_t);
cf->first_packet = TRUE;
cf->count = 0;
cf->drops = 0;
diff --git a/file.h b/file.h
index ee64e644ae..6680467cc1 100644
--- a/file.h
+++ b/file.h
@@ -1,7 +1,7 @@
/* file.h
* Definitions for file structures and routines
*
- * $Id: file.h,v 1.58 1999/11/30 20:49:47 guy Exp $
+ * $Id: file.h,v 1.59 1999/12/04 08:59:13 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -81,7 +81,6 @@ typedef struct _capture_file {
gboolean user_saved;/* If capture file is temporary, has it been saved by user yet? */
long f_len; /* Length of capture file */
guint16 cd_t; /* File type of capture file */
- const gchar *cd_t_desc; /* Description of that file type */
gboolean first_packet; /* TRUE if we're looking at the first packet */
int lnk_t; /* Link-layer type with which to save capture */
guint32 vers; /* Version. For tcpdump minor is appended to major */
diff --git a/summary.c b/summary.c
index 77a0b23162..75e18f9d61 100644
--- a/summary.c
+++ b/summary.c
@@ -1,7 +1,7 @@
/* summary.c
* Routines for capture file summary window
*
- * $Id: summary.c,v 1.13 1999/10/11 06:39:01 guy Exp $
+ * $Id: summary.c,v 1.14 1999/12/04 08:59:12 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -175,7 +175,8 @@ summary_prep_cb(GtkWidget *w, gpointer d) {
add_string_to_box(string_buff, file_box);
/* format */
- snprintf(string_buff, SUM_STR_MAX, "Format: %s", cf.cd_t_desc);
+ snprintf(string_buff, SUM_STR_MAX, "Format: %s",
+ wtap_file_type_string(cf.cd_t));
add_string_to_box(string_buff, file_box);
/* snapshot length */