diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2012-04-17 18:57:40 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2012-04-17 18:57:40 +0000 |
| commit | fc63e07135d645af0df8d393aa84c0ae3b7e1924 (patch) | |
| tree | f40524fe8e0facf5542c6b02041bc1fc63eae66e /res/res_musiconhold.c | |
| parent | 70c5ac6635062efe03b51fb6c7afd30c22028be9 (diff) | |
Avoid cppcheck warnings; removing unused vars and a bit of cleanup.
Patch by: junky
Review: https://reviewboard.asterisk.org/r/1743/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@362307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_musiconhold.c')
| -rw-r--r-- | res/res_musiconhold.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 639c3b05f..7d5c96922 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1099,16 +1099,19 @@ static int moh_scan_files(struct mohclass *class) { return -1; } - for (i = 0; i < class->total_files; i++) + for (i = 0; i < class->total_files; i++) { ast_free(class->filearray[i]); - + } class->total_files = 0; + if (!getcwd(path, sizeof(path))) { ast_log(LOG_WARNING, "getcwd() failed: %s\n", strerror(errno)); + closedir(files_DIR); return -1; } if (chdir(dir_path) < 0) { ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno)); + closedir(files_DIR); return -1; } while ((files_dirent = readdir(files_DIR))) { |