diff options
author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-04-30 12:56:40 +0000 |
---|---|---|
committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-04-30 12:56:40 +0000 |
commit | bc2fe48e3193a4bb92db6c7b4bb9f8b1a3476526 (patch) | |
tree | 55c75d708ea58b697383757895a54a1aeb380b1f /fileset.c | |
parent | 9aa0f1a881e65a025403d50414f1ca5dac6ed242 (diff) |
fix buildbot reported problems (unix related), part 4, more GLib 1.x related
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14240 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'fileset.c')
-rw-r--r-- | fileset.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -265,7 +265,7 @@ fileset_add_dir(const char *fname) /* go through the files in the directory and check if it's part of the current file set */ #if GLIB_MAJOR_VERSION < 2 - if ((dir = opendir(dirname)) != NULL) { + if ((dir = opendir(dirname->str)) != NULL) { while ((file = readdir(dir)) != NULL) { name = (gchar *)file->d_name; #else @@ -281,7 +281,9 @@ fileset_add_dir(const char *fname) } } +#if GLIB_MAJOR_VERSION >= 2 g_free(dummy); +#endif g_string_free(dirname, TRUE /* free_segment */); /* sort entries by creation time */ @@ -364,7 +366,7 @@ fileset_get_previous(void) /* delete a single entry */ -void fileset_entry_delete(gpointer data, gpointer user_data) +void fileset_entry_delete(gpointer data, gpointer user_data _U_) { fileset_entry *entry = data; |