diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-05-08 22:59:19 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-05-09 03:04:39 +0000 |
| commit | 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a (patch) | |
| tree | 8cc6eaa5a6982454a00adc600fa4aab02bec3d73 /ui/gtk/capture_file_dlg.c | |
| parent | aa3a968eb6e85c47014a4cec4a2b955357b0e77f (diff) | |
| download | wireshark-1abeb277f5e6bd27fbaebfecc8184e37ba9d008a.tar.gz | |
Refactor Wiretap
Start of refactoring Wiretap and breaking structures down into "generally useful fields for dissection" and "capture specific". Since this in intended as a "base" for Wiretap and Filetap, the "wft" prefix is used for "common" functionality.
The "architectural" changes can be found in cfile.h, wtap.h, wtap-int.h and (new file) wftap-int.h. Most of the other (painstaking) changes were really just the result of compiling those new architecture changes.
bug:9607
Change-Id: Ife858a61760d7a8a03be073546c0e7e582cab2ae
Reviewed-on: https://code.wireshark.org/review/1485
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk/capture_file_dlg.c')
| -rw-r--r-- | ui/gtk/capture_file_dlg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index baef2baed9..a2b2b7819b 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -105,11 +105,11 @@ static gboolean color_selected; /* set a new filename for the preview widget */ -static wtap * +static wftap * preview_set_filename(GtkWidget *prev, const gchar *cf_name) { GtkWidget *label; - wtap *wth; + wftap *wth; int err = 0; gchar *err_info; gchar string_buff[PREVIEW_STR_MAX]; @@ -150,7 +150,7 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name) } /* Find the size of the file. */ - filesize = wtap_file_size(wth, &err); + filesize = wftap_file_size(wth, &err); if (filesize == -1) { gtk_label_set_text(GTK_LABEL(label), "error getting file size"); wtap_close(wth); @@ -161,7 +161,7 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name) gtk_label_set_text(GTK_LABEL(label), string_buff); /* type */ - g_strlcpy(string_buff, wtap_file_type_subtype_string(wtap_file_type_subtype(wth)), PREVIEW_STR_MAX); + g_strlcpy(string_buff, wtap_file_type_subtype_string(wftap_file_type_subtype(wth)), PREVIEW_STR_MAX); label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY); gtk_label_set_text(GTK_LABEL(label), string_buff); @@ -171,7 +171,7 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name) /* do a preview run on the currently selected capture file */ static void -preview_do(GtkWidget *prev, wtap *wth) +preview_do(GtkWidget *prev, wftap *wth) { GtkWidget *label; unsigned int elapsed_time; @@ -299,7 +299,7 @@ file_open_entry_changed(GtkWidget *w _U_, gpointer file_sel) GtkWidget *prev = (GtkWidget *)g_object_get_data(G_OBJECT(file_sel), PREVIEW_TABLE_KEY); gchar *cf_name; gboolean have_preview; - wtap *wth; + wftap *wth; /* get the filename */ cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_sel)); |