Add a routine to return the display name for a "capture_file" structure,

rather than constructing that name when a capture file is opened and
putting a pointer to it in that structure.

svn path=/trunk/; revision=8476

7 files changed, 21 insertions, 70 deletions

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 60e88d1967..1245732a26 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -1,7 +1,7 @@
 /* dcerpc_stat.c
  * dcerpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: dcerpc_stat.c,v 1.19 2003/09/15 20:37:36 guy Exp $
+ * $Id: dcerpc_stat.c,v 1.20 2003/09/15 22:16:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -37,7 +37,6 @@
 #include <gtk/gtk.h>
 #include "menu.h"
 #include "epan/packet_info.h"
-#include "epan/filesystem.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
 #include "ui_util.h"
@@ -88,10 +87,7 @@ dcerpcstat_reset(rpcstat_t *rs)
 	char title_string[256];
 	reset_srt_table_data(&rs->srt_table);
 
-	if (cfile.displayname)
-		snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d : %s", rs->prog, rs->ver&0xff, rs->ver>>8, cfile.displayname);
-	else
-		snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d", rs->prog, rs->ver&0xff, rs->ver>>8);
+	snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d : %s", rs->prog, rs->ver&0xff, rs->ver>>8, cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
 }
 
@@ -215,10 +211,7 @@ gtk_dcerpcstat_init(char *optarg)
 
 	rs->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
-	if (cfile.displayname)
-		snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d : %s", rs->prog, rs->ver&0xff, rs->ver>>8, cfile.displayname);
-	else
-		snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d", rs->prog, rs->ver&0xff, rs->ver>>8);
+	snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d : %s", rs->prog, rs->ver&0xff, rs->ver>>8, cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
 	SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs);
 
diff --git a/gtk/endpoint_talkers_table.c b/gtk/endpoint_talkers_table.c
index 39e3976006..b1839d8226 100644
--- a/gtk/endpoint_talkers_table.c
+++ b/gtk/endpoint_talkers_table.c
@@ -4,7 +4,7 @@
  * endpoint_talkers_table   2003 Ronnie Sahlberg
  * Helper routines common to all endpoint talkers tap.
  *
- * $Id: endpoint_talkers_table.c,v 1.18 2003/09/15 20:37:36 guy Exp $
+ * $Id: endpoint_talkers_table.c,v 1.19 2003/09/15 22:16:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -36,7 +36,6 @@
 #include <gtk/gtk.h>
 #include "compat_macros.h"
 #include "epan/packet_info.h"
-#include "epan/filesystem.h"
 #include "epan/to_str.h"
 #include "endpoint_talkers_table.h"
 #include "image/clist_ascend.xpm"
@@ -206,10 +205,7 @@ reset_ett_table_data(endpoints_table *et)
 	guint32 i;
 	char title[256];
 
-	if (cfile.displayname)
-		snprintf(title, 255, "%s Conversations: %s", et->name, cfile.displayname);
-	else
-		snprintf(title, 255, "%s Conversations", et->name);
+	snprintf(title, 255, "%s Conversations: %s", et->name, cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(et->win), title);
 
 	/* remove all entries from the clist */
@@ -884,10 +880,7 @@ init_ett_table(gboolean hide_ports, char *table_name, char *tap_name, char *filt
 	talkers->name=table_name;
 	talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
-	if (cfile.displayname)
-		snprintf(title, 255, "%s Conversations: %s", table_name, cfile.displayname);
-	else
-		snprintf(title, 255, "%s Conversations", table_name);
+	snprintf(title, 255, "%s Conversations: %s", table_name, cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(talkers->win), title);
 
 	SIGNAL_CONNECT(talkers->win, "destroy", ett_win_destroy_cb, talkers);
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index b892483a80..37fce3ad07 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -1,7 +1,7 @@
 /* fc_stat.c
  * fc_stat   2003 Ronnie Sahlberg
  *
- * $Id: fc_stat.c,v 1.7 2003/09/15 20:37:36 guy Exp $
+ * $Id: fc_stat.c,v 1.8 2003/09/15 22:16:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -38,7 +38,6 @@
 #include "../epan/packet_info.h"
 #include "../tap.h"
 #include "../epan/value_string.h"
-#include "../epan/filesystem.h"
 #include "../packet-fc.h"
 #include "../register.h"
 #include "../timestats.h"
@@ -65,10 +64,7 @@ fcstat_reset(void *pfc)
 	char title[256];
 
 	reset_srt_table_data(&fc->fc_srt_table);
-	if (cfile.displayname)
-		snprintf(title, 255, "Fibre Channel Service Response Time statistics: %s", cfile.displayname);
-	else
-		snprintf(title, 255, "Fibre Channel Service Response Time statistics");
+	snprintf(title, 255, "Fibre Channel Service Response Time statistics: %s", cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(fc->win), title);
 }
 
@@ -141,10 +137,7 @@ gtk_fcstat_init(char *optarg)
 
 	fc->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(fc->win), 550, 400);
-	if (cfile.displayname)
-		snprintf(title, 255, "Fibre Channel Service Response Time statistics: %s", cfile.displayname);
-	else
-		snprintf(title, 255, "Fibre Channel Service Response Time statistics");
+	snprintf(title, 255, "Fibre Channel Service Response Time statistics: %s", cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(fc->win), title);
 	SIGNAL_CONNECT(fc->win, "destroy", win_destroy_cb, fc);
 
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index 6cf22cc6ad..2a0d3eec83 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -1,7 +1,7 @@
 /* io_stat.c
  * io_stat   2002 Ronnie Sahlberg
  *
- * $Id: io_stat.c,v 1.25 2003/09/15 20:37:36 guy Exp $
+ * $Id: io_stat.c,v 1.26 2003/09/15 22:16:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -42,7 +42,6 @@
 #include "menu.h"
 #include "epan/epan_dissect.h"
 #include "epan/packet_info.h"
-#include "epan/filesystem.h"
 #include "../tap.h"
 #include "../register.h"
 #include "simple_dialog.h"
@@ -224,10 +223,7 @@ gtk_iostat_reset(void *g)
 	gio->io->last_interval=0xffffffff;
 	gio->io->max_interval=0;
 
-	if (cfile.displayname)
-		snprintf(title, 255, "IO-Stat: %s", cfile.displayname);
-	else
-		snprintf(title, 255, "IO-Stat");
+	snprintf(title, 255, "IO-Stat: %s", cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(gio->io->window), title);
 }
 
@@ -1646,10 +1642,7 @@ init_io_stat_window(io_stat_t *io)
 	create_ctrl_area(io, hbox);
 
 	gtk_widget_show(io->window);
-	if (cfile.displayname)
-		snprintf(title, 255, "IO-Stat: %s", cfile.displayname);
-	else
-		snprintf(title, 255, "IO-Stat");
+	snprintf(title, 255, "IO-Stat: %s", cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(io->window), title);
 }
 
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 2ab53f7033..69eaa85a68 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -2,7 +2,7 @@
  * mgcp-statistics for ethereal
  * Copyright 2003 Lars Roland
  *
- * $Id: mgcp_stat.c,v 1.11 2003/09/15 20:37:37 guy Exp $
+ * $Id: mgcp_stat.c,v 1.12 2003/09/15 22:16:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -37,7 +37,6 @@
 #include <string.h>
 #include "menu.h"
 #include "../epan/packet_info.h"
-#include "../epan/filesystem.h"
 #include "../tap.h"
 #include "../epan/value_string.h"
 #include "../register.h"
@@ -110,10 +109,7 @@ mgcpstat_reset(void *pms)
 	ms->req_dup_num=0;
 	ms->rsp_dup_num=0;
 
-	if (cfile.displayname)
-		snprintf(title, 255, "MGCP SRT Statistics: %s", cfile.displayname);
-	else
-		snprintf(title, 255, "MGCP SRT Statistics");
+	snprintf(title, 255, "MGCP SRT Statistics: %s", cf_get_display_name(&cfile));
 	if (! dlg)
 		dlg=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(dlg), title);
@@ -350,10 +346,7 @@ gtk_mgcpstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	}
 
 	dlg=gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	if (cfile.displayname)
-		snprintf(title, 255, "MGCP SRT Statistics: %s", cfile.displayname);
-	else
-		snprintf(title, 255, "MGCP SRT Statistics");
+	snprintf(title, 255, "MGCP SRT Statistics: %s", cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(dlg), title);
 	SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
 	dlg_box=gtk_vbox_new(FALSE, 0);
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index c4ecf36fbf..7e7024967c 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -1,7 +1,7 @@
 /* rpc_stat.c
  * rpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: rpc_stat.c,v 1.18 2003/09/15 20:37:37 guy Exp $
+ * $Id: rpc_stat.c,v 1.19 2003/09/15 22:16:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,6 @@
 #include <gtk/gtk.h>
 #include "menu.h"
 #include "epan/packet_info.h"
-#include "epan/filesystem.h"
 #include "simple_dialog.h"
 #include "tap.h"
 #include "../register.h"
@@ -66,10 +65,7 @@ rpcstat_reset(rpcstat_t *rs)
 
 	reset_srt_table_data(&rs->srt_table);
 
-	if (cfile.displayname)
-		snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d: %s", rs->prog, rs->version, cfile.displayname);
-	else
-		snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d", rs->prog, rs->version);
+	snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d: %s", rs->prog, rs->version, cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
 }
 
@@ -219,10 +215,7 @@ gtk_rpcstat_init(char *optarg)
 
 	rs->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
-	if (cfile.displayname)
-		snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d: %s", rs->prog, rs->version, cfile.displayname);
-	else
-		snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d", rs->prog, rs->version);
+	snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d: %s", rs->prog, rs->version, cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
 	SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs);
 
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index e37ac0d53c..3a7357981a 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -1,7 +1,7 @@
 /* smb_stat.c
  * smb_stat   2003 Ronnie Sahlberg
  *
- * $Id: smb_stat.c,v 1.15 2003/09/15 20:37:37 guy Exp $
+ * $Id: smb_stat.c,v 1.16 2003/09/15 22:16:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -36,7 +36,6 @@
 #include <string.h>
 #include "menu.h"
 #include "../epan/packet_info.h"
-#include "../epan/filesystem.h"
 #include "../tap.h"
 #include "../epan/value_string.h"
 #include "../smb.h"
@@ -69,10 +68,7 @@ smbstat_reset(void *pss)
 	reset_srt_table_data(&ss->smb_srt_table);
 	reset_srt_table_data(&ss->trans2_srt_table);
 	reset_srt_table_data(&ss->nt_trans_srt_table);
-	if (cfile.displayname)
-		snprintf(title, 255, "SMB Service Response Time statistics: %s", cfile.displayname);
-	else
-		snprintf(title, 255, "SMB Service Response Time statistics");
+	snprintf(title, 255, "SMB Service Response Time statistics: %s", cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(ss->win), title);
 }
 
@@ -159,10 +155,7 @@ gtk_smbstat_init(char *optarg)
 
 	ss->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(ss->win), 550, 600);
-	if (cfile.displayname)
-		snprintf(title, 255, "SMB Service Response Time statistics: %s", cfile.displayname);
-	else
-		snprintf(title, 255, "SMB Service Response Time statistics");
+	snprintf(title, 255, "SMB Service Response Time statistics: %s", cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(ss->win), title);
 	SIGNAL_CONNECT(ss->win, "destroy", win_destroy_cb, ss);