diff options
author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-02-26 19:13:43 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-02-26 19:13:43 +0000 |
commit | 2389b572327a1d14093edc0cf445a961e9595898 (patch) | |
tree | a7928b496c8ef177b2d0cf6f9b3ab9ddaeaa8216 /filters.c | |
parent | 1c319c4e2c0f299c9ff9e54726b28221c84cb228 (diff) |
get_datafile_path() and get_persconffile_path() return malloc'd memory,
free it when we're done with the file name.
svn path=/trunk/; revision=24478
Diffstat (limited to 'filters.c')
-rw-r--r-- | filters.c | 49 |
1 files changed, 26 insertions, 23 deletions
@@ -170,33 +170,36 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return, g_free(ff_path); ff_path = get_persconffile_path(FILTER_FILE_NAME, FALSE, FALSE); if ((ff = eth_fopen(ff_path, "r")) == NULL) { - /* - * Did that fail because the file didn't exist? - */ - if (errno != ENOENT) { /* - * No. Just give up. + * Did that fail because the file didn't exist? */ - *pref_path_return = ff_path; - *errno_return = errno; - return; - } - - /* - * Try to open the global "cfilters/dfilters" file */ - ff_path = get_datafile_path(ff_name); - if ((ff = eth_fopen(ff_path, "r")) == NULL) { + if (errno != ENOENT) { + /* + * No. Just give up. + */ + *pref_path_return = ff_path; + *errno_return = errno; + return; + } /* - * Well, that didn't work, either. Just give up. - * Return an error if the file existed but we couldn't open it. - */ - if (errno != ENOENT) { - *pref_path_return = ff_path; - *errno_return = errno; - } - return; - } + * Try to open the global "cfilters/dfilters" file */ + g_free(ff_path); + ff_path = get_datafile_path(ff_name); + if ((ff = eth_fopen(ff_path, "r")) == NULL) { + + /* + * Well, that didn't work, either. Just give up. + * Return an error if the file existed but we couldn't open it. + */ + if (errno != ENOENT) { + *pref_path_return = ff_path; + *errno_return = errno; + } else { + g_free(ff_path); + } + return; + } } } |