diff options
author | Guy Harris <guy@alum.mit.edu> | 2005-11-07 08:36:25 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2005-11-07 08:36:25 +0000 |
commit | ca781ff145273791049ff190648dad92331de186 (patch) | |
tree | acf6ee316a1b09f255adfb06e2254fcc600ee668 | |
parent | 8e5823e0fe887dfa2ceec23fb00233d1da029acc (diff) |
Use eth_dir_open(), not g_dir_open(); g_dir_open() isn't available in
GLib 1.2[.x].
svn path=/trunk/; revision=16412
-rw-r--r-- | epan/plugins.c | 2 | ||||
-rw-r--r-- | fileset.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/epan/plugins.c b/epan/plugins.c index 1eef0d5496..eaa380cab8 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -165,7 +165,7 @@ plugins_scan_dir(const char *dirname) } #endif - if ((dir = g_dir_open(dirname, 0, NULL)) != NULL) + if ((dir = eth_dir_open(dirname, 0, NULL)) != NULL) { while ((file = eth_dir_read_name(dir)) != NULL) { @@ -51,7 +51,7 @@ #include <glib.h> -#include "file_util.h" +#include <wiretap/file_util.h> #include "globals.h" #include <epan/filesystem.h> @@ -259,7 +259,7 @@ fileset_add_dir(const char *fname) /* is the current file probably a part of any fileset? */ if(fileset_filename_match_pattern(fname)) { /* yes, go through the files in the directory and check if the file in question is part of the current file set */ - if ((dir = g_dir_open(dirname->str, 0, NULL)) != NULL) { + if ((dir = eth_dir_open(dirname->str, 0, NULL)) != NULL) { while ((file = eth_dir_read_name(dir)) != NULL) { name = eth_dir_get_name(file); if(fileset_filename_match_pattern(name) && fileset_is_file_in_set(name, get_basename(fname))) { |