From: Mark Spencer Date: Wed, 23 Jun 2004 20:19:12 +0000 (+0000) Subject: datetime patches from Tilghman (bug #1905) X-Git-Tag: 1.0.0-rc1~169 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da49f53b666438c5bde2e72bc2b6243f931cdebd;p=thirdparty%2Fasterisk.git datetime patches from Tilghman (bug #1905) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3289 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/say.c b/say.c index c527d9afee..cd4cb877b1 100755 --- a/say.c +++ b/say.c @@ -1836,8 +1836,7 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, char *int for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++) sndfile[sndoffset] = format[offset]; sndfile[sndoffset] = '\0'; - snprintf(nextmsg,sizeof(nextmsg), AST_SOUNDS "/%s", sndfile); - res = wait_file(chan,ints,nextmsg,lang); + res = wait_file(chan,ints,sndfile,lang); break; case 'A': case 'a': @@ -2118,8 +2117,7 @@ int ast_say_date_with_format_de(struct ast_channel *chan, time_t time, char *int for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++) sndfile[sndoffset] = format[offset]; sndfile[sndoffset] = '\0'; - snprintf(nextmsg,sizeof(nextmsg), AST_SOUNDS "/%s", sndfile); - res = wait_file(chan,ints,nextmsg,lang); + res = wait_file(chan,ints,sndfile,lang); break; case 'A': case 'a': @@ -2584,8 +2582,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t time, char *int for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++) sndfile[sndoffset] = format[offset]; sndfile[sndoffset] = '\0'; - snprintf(nextmsg,sizeof(nextmsg), AST_SOUNDS "/%s", sndfile); - res = wait_file(chan,ints,nextmsg,lang); + res = wait_file(chan,ints,sndfile,lang); break; case 'A': case 'a': @@ -3012,8 +3009,7 @@ int ast_say_date_with_format_tw(struct ast_channel *chan, time_t time, char *int for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++) sndfile[sndoffset] = format[offset]; sndfile[sndoffset] = '\0'; - snprintf(nextmsg,sizeof(nextmsg), AST_SOUNDS "/%s", sndfile); - res = wait_file(chan,ints,nextmsg,lang); + res = wait_file(chan,ints,sndfile,lang); break; case 'A': case 'a':