From 0ae03134156249c05dd8699ca226e2601974e607 Mon Sep 17 00:00:00 2001 From: citats Date: Wed, 26 May 2004 16:51:25 +0000 Subject: Formatting fixes git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3076 f38db490-d61c-443f-a65b-d21fe96a405b --- app.c | 16 ++++++++-------- apps/app_voicemail.c | 4 +--- include/asterisk/app.h | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app.c b/app.c index e272dce54..15a15f2b3 100755 --- a/app.c +++ b/app.c @@ -407,12 +407,12 @@ int ast_linear_stream(struct ast_channel *chan, const char *filename, int fd, in return res; } -int ast_control_streamfile(struct ast_channel *chan, char *file,char *f,char *r,int skipms) { - int res; - if ((res = ast_streamfile(chan, file, chan->language))) - ast_log(LOG_WARNING, "Unable to stream file %s\n", file); - if (!res) - res = ast_waitstream_fr(chan, AST_DIGIT_ANY,f,r,skipms); - return res; +int ast_control_streamfile(struct ast_channel *chan, char *file, char *f, char *r, int skipms) +{ + int res; + if ((res = ast_streamfile(chan, file, chan->language))) + ast_log(LOG_WARNING, "Unable to stream file %s\n", file); + if (!res) + res = ast_waitstream_fr(chan, AST_DIGIT_ANY,f,r,skipms); + return res; } - diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 8c0a2fef0..9bce8c681 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -2549,9 +2549,7 @@ static int wait_file2(struct ast_channel *chan, struct vm_state *vms, char *file static int wait_file(struct ast_channel *chan, struct vm_state *vms, char *file) { - - return ast_control_streamfile(chan,file,"#","*",skipms); - + return ast_control_streamfile(chan, file, "#", "*", skipms); } static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *vmu, char *origtime, char *filename) diff --git a/include/asterisk/app.h b/include/asterisk/app.h index dacdf95eb..618e94f83 100755 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -55,7 +55,7 @@ int ast_dtmf_stream(struct ast_channel *chan, struct ast_channel *peer, char *di int ast_linear_stream(struct ast_channel *chan, const char *filename, int fd, int allowoverride); //! Stream a file with fast forward and reverse. -int ast_control_streamfile(struct ast_channel *chan, char *file,char *f,char *r,int skipms); +int ast_control_streamfile(struct ast_channel *chan, char *file, char *f, char *r, int skipms); #if defined(__cplusplus) || defined(c_plusplus) } -- cgit v1.2.3