kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 316265 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316265 | russell | 2011-05-03 14:55:49 -0500 (Tue, 03 May 2011) | 5 lines
  
  Fix a bunch of compiler warnings generated by gcc 4.6.0.
  
  Most of these are -Wunused-but-set-variable, but there were a few others
  mixed in here, as well.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2011-05-03 20:45:32 +00:00
parent 810b9c8879
commit 37aa52fd78
35 changed files with 69 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_musiconhold.c
View File

@@ -658,13 +658,11 @@ static void *monmp3thread(void *data)
}
if (class->timer) {
struct pollfd pfd = { .fd = ast_timer_fd(class->timer), .events = POLLIN, };
struct timeval tv;
#ifdef SOLARIS
thr_yield();
#endif
/* Pause some amount of time */
tv = ast_tvnow();
if (ast_poll(&pfd, 1, -1) > 0) {
ast_timer_ack(class->timer, 1);
res = 320;
@@ -1044,7 +1042,6 @@ static int moh_scan_files(struct mohclass *class) {
char filepath[PATH_MAX];
char *ext;
struct stat statbuf;
int dirnamelen;
int i;
if (class->dir[0] != '/') {
@@ -1065,7 +1062,6 @@ static int moh_scan_files(struct mohclass *class) {
ast_free(class->filearray[i]);
class->total_files = 0;
dirnamelen = strlen(dir_path) + 2;
if (!getcwd(path, sizeof(path))) {
ast_log(LOG_WARNING, "getcwd() failed: %s\n", strerror(errno));
return -1;