From 37aa52fd78996b5c516ff4c851b60252eda84b05 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 3 May 2011 20:45:32 +0000 Subject: Merged revisions 316265 via svnmerge from 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 --- res/res_musiconhold.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'res/res_musiconhold.c') diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index feeabe312..db7f8525c 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -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; -- cgit v1.2.3