sq epan/dissectors/packet-smb2.c no check_col => fsctl_pipe_wait

[metze/wireshark/wip.git] / fileset.c

diff --git a/fileset.c b/fileset.c
index f4c485b2b0ffbed908682219651e57d30434ae7c..6318a4146754118044496356af63621d1025470e 100644 (file)
--- a/fileset.c
+++ b/fileset.c
@@ -19,12 +19,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -53,9 +51,10 @@
 #include <glib.h>
 
 #include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>
 #include "globals.h"
 
-#include <epan/filesystem.h>
+#include <epan/strutil.h>
 
 #include "fileset.h"
 
@@ -127,7 +126,7 @@ fileset_filename_match_pattern(const char *fname)
 
 /* test, if both files could be in the same file set */
 /* (the filenames must already be in correct shape) */
-gboolean
+static gboolean
 fileset_is_file_in_set(const char *fname1, const char *fname2)
 {
     char        *pfx1;
@@ -269,7 +268,7 @@ fileset_sort_compare(gconstpointer a, gconstpointer b)
 
 
 /* add all file set entries to the dialog */
-void fileset_update_dlg(void)
+void fileset_update_dlg(void *window)
 {
     GList         *le;
 
@@ -277,7 +276,7 @@ void fileset_update_dlg(void)
     /* add all entires to the dialog */
     le = g_list_first(set.entries);
     while(le) {
-        fileset_dlg_add_file((fileset_entry *)le->data);
+        fileset_dlg_add_file((fileset_entry *)le->data, window);
         le = g_list_next(le);
     }
 }
@@ -285,7 +284,7 @@ void fileset_update_dlg(void)
 
 /* walk through the directory of the loaded file and add every file matching the current file */
 void
-fileset_add_dir(const char *fname)
+fileset_add_dir(const char *fname, void *window)
 {
     WS_DIR        *dir;             /* scanned directory */
     WS_DIRENT     *file;            /* current file */
@@ -327,7 +326,7 @@ fileset_add_dir(const char *fname)
     /* sort entries by creation time */
     set.entries = g_list_sort(set.entries, fileset_sort_compare);
 
-    fileset_update_dlg();
+    fileset_update_dlg(window);
 }
 
 
@@ -432,5 +431,3 @@ void fileset_delete(void)
         set.dirname = NULL;
     }
 }
-
-