osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

We no longer generate a "Loading" message ourselves, we just pass the 

name of the file being loaded to "delayed_create_progress_dlg()".  Get
rid of the pointless "g_strdup_printf()" call (which amounted to a
more-expensive "g_strdup()", and the variables it used.

svn path=/trunk/; revision=15248
This commit is contained in:
Guy Harris 2005-08-06 18:40:03 +00:00
parent d473807893
commit 23b2341a9b
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
file.c
View File

@ -331,7 +331,6 @@ cf_read(capture_file *cf)
int err; int err;
gchar *err_info; gchar *err_info;
const gchar *name_ptr; const gchar *name_ptr;
const gchar *load_msg, *load_fmt = "%s";
const char *errmsg; const char *errmsg;
char errmsg_errno[1024+1]; char errmsg_errno[1024+1];
gchar err_str[2048+1]; gchar err_str[2048+1];
@ -360,7 +359,6 @@ cf_read(capture_file *cf)
cf_callback_invoke(cf_cb_file_read_start, cf); cf_callback_invoke(cf_cb_file_read_start, cf);
name_ptr = get_basename(cf->filename); name_ptr = get_basename(cf->filename);
load_msg = g_strdup_printf(load_fmt, name_ptr);
/* Update the progress bar when it gets to this value. */ /* Update the progress bar when it gets to this value. */
progbar_nextstep = 0; progbar_nextstep = 0;
@ -399,10 +397,8 @@ cf_read(capture_file *cf)
} }
if (progbar == NULL) { if (progbar == NULL) {
/* Create the progress bar if necessary */ /* Create the progress bar if necessary */
progbar = delayed_create_progress_dlg("Loading", load_msg, progbar = delayed_create_progress_dlg("Loading", name_ptr,
&stop_flag, &start_time, prog_val); &stop_flag, &start_time, prog_val);
if (progbar != NULL)
g_free(load_msg);
} }
if (progbar != NULL) { if (progbar != NULL) {
g_snprintf(status_str, sizeof(status_str), g_snprintf(status_str, sizeof(status_str),
@ -426,9 +422,7 @@ cf_read(capture_file *cf)
} }
/* We're done reading the file; destroy the progress bar if it was created. */ /* We're done reading the file; destroy the progress bar if it was created. */
if (progbar == NULL) if (progbar != NULL)
g_free(load_msg);
else
destroy_progress_dlg(progbar); destroy_progress_dlg(progbar);
/* We're done reading sequentially through the file. */ /* We're done reading sequentially through the file. */