diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-10-27 04:47:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-10-27 04:47:57 +0000 |
| commit | 09bf9e694629b37f201467b988589573f5c3acf9 (patch) | |
| tree | 2751ea93785d63f9b3e18491db9a4acf9999f162 | |
| parent | b8b74f901ddcf364155fefdd62229b26fd945e7f (diff) | |
| download | wireshark-09bf9e694629b37f201467b988589573f5c3acf9.tar.gz | |
ETH -> WS updates.
svn path=/trunk/; revision=26570
| -rw-r--r-- | epan/filesystem.c | 4 | ||||
| -rw-r--r-- | epan/plugins.c | 8 | ||||
| -rw-r--r-- | fileset.c | 4 | ||||
| -rw-r--r-- | gtk/profile_dlg.c | 12 | ||||
| -rw-r--r-- | wsutil/file_util.h | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/epan/filesystem.c b/epan/filesystem.c index fc60e448a2..4c6fc3c461 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -970,8 +970,8 @@ profile_exists(const gchar *profilename) static int delete_directory (const char *directory, char **pf_dir_path_return) { - ETH_DIR *dir; - ETH_DIRENT *file; + WS_DIR *dir; + WS_DIRENT *file; gchar *filename; int ret = 0; diff --git a/epan/plugins.c b/epan/plugins.c index ed8aaa3f8c..8837b847cf 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -132,8 +132,8 @@ static void plugins_scan_dir(const char *dirname) { #define FILENAME_LEN 1024 - ETH_DIR *dir; /* scanned directory */ - ETH_DIRENT *file; /* current file */ + WS_DIR *dir; /* scanned directory */ + WS_DIRENT *file; /* current file */ const char *name; gchar filename[FILENAME_LEN]; /* current file name */ GModule *handle; /* handle returned by dlopen */ @@ -342,8 +342,8 @@ init_plugins(void) const char *name; char *plugin_dir_path; char *plugins_pers_dir; - ETH_DIR *dir; /* scanned directory */ - ETH_DIRENT *file; /* current file */ + WS_DIR *dir; /* scanned directory */ + WS_DIRENT *file; /* current file */ if (plugin_list == NULL) /* ensure init_plugins is only run once */ { @@ -242,8 +242,8 @@ void fileset_update_dlg(void) void fileset_add_dir(const char *fname) { - ETH_DIR *dir; /* scanned directory */ - ETH_DIRENT *file; /* current file */ + WS_DIR *dir; /* scanned directory */ + WS_DIRENT *file; /* current file */ const char *name; fileset_entry *entry; GString *dirname; diff --git a/gtk/profile_dlg.c b/gtk/profile_dlg.c index 96f5f8d912..f0751e25f3 100644 --- a/gtk/profile_dlg.c +++ b/gtk/profile_dlg.c @@ -154,8 +154,8 @@ copy_profile_list(void) static GtkTreeIter * fill_list(GtkWidget *main_w) { - ETH_DIR *dir; /* scanned directory */ - ETH_DIRENT *file; /* current file */ + WS_DIR *dir; /* scanned directory */ + WS_DIRENT *file; /* current file */ GList *fl_entry; profile_def *profile; GtkTreeView *profile_l; @@ -841,7 +841,7 @@ profile_dialog_new(void) } -static void +static void select_profile_cb (GtkWidget *w _U_, gpointer data) { const gchar *current_profile = get_profile_name (); @@ -858,8 +858,8 @@ profile_show_popup_cb (GtkWidget *w _U_, GdkEvent *event) GdkEventButton *bevent = (GdkEventButton *)event; const gchar *profile_name = get_profile_name (); const gchar *profiles_dir, *name; - ETH_DIR *dir; /* scanned directory */ - ETH_DIRENT *file; /* current file */ + WS_DIR *dir; /* scanned directory */ + WS_DIRENT *file; /* current file */ GtkWidget *menu; GtkWidget *menu_item; @@ -897,7 +897,7 @@ profile_show_popup_cb (GtkWidget *w _U_, GdkEvent *event) gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, bevent->button, bevent->time); - + return TRUE; } diff --git a/wsutil/file_util.h b/wsutil/file_util.h index 1508ede555..86521f0074 100644 --- a/wsutil/file_util.h +++ b/wsutil/file_util.h @@ -106,8 +106,8 @@ extern FILE * ws_stdio_freopen (const gchar *filename, const gchar *mode, FILE * #endif /* _WIN32 */ /* directory handling */ -#define ETH_DIR GDir -#define ETH_DIRENT const char +#define WS_DIR GDir +#define WS_DIRENT const char #define ws_dir_open g_dir_open #define ws_dir_read_name g_dir_read_name #define ws_dir_get_name(dirent) dirent |