diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-03 20:45:32 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-03 20:45:32 +0000 |
| commit | 681ceaeaace7706e84c5bc71c0d5253b2ae3f3a6 (patch) | |
| tree | e1651180838e594a0203f863f3cdd084860e1bf5 /apps/app_festival.c | |
| parent | 39277e4ddd2ca81426bc72dfc62d8f5985d075d2 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@316293 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_festival.c')
| -rw-r--r-- | apps/app_festival.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/apps/app_festival.c b/apps/app_festival.c index f6f3734ca..a30302fa7 100644 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -163,7 +163,6 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in { int res = 0; int fds[2]; - int pid = -1; int needed = 0; struct ast_format owriteformat; struct ast_frame *f; @@ -196,7 +195,6 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in res = send_waveform_to_fd(waveform, length, fds[1]); if (res >= 0) { - pid = res; /* Order is important -- there's almost always going to be mp3... we want to prioritize the user */ for (;;) { @@ -258,10 +256,6 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in close(fds[0]); close(fds[1]); -#if 0 - if (pid > -1) - kill(pid, SIGKILL); -#endif if (!res && owriteformat.id) ast_set_write_format(chan, &owriteformat); return res; @@ -285,7 +279,6 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) char ack[4]; char *waveform; int filesize; - int wave; char bigstring[MAXFESTLEN]; int i; struct MD5Context md5ctx; @@ -494,7 +487,6 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) /* Read back info from server */ /* This assumes only one waveform will come back, also LP is unlikely */ - wave = 0; do { int read_data; for (n = 0; n < 3; ) { |