Formatting fixes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3076 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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 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)))
+	int res;
-    ast_log(LOG_WARNING, "Unable to stream file  %s\n", file);
+	if ((res = ast_streamfile(chan, file, chan->language)))
-  if (!res)
+		ast_log(LOG_WARNING, "Unable to stream file  %s\n", file);
-    res = ast_waitstream_fr(chan, AST_DIGIT_ANY,f,r,skipms);
+	if (!res)
-  return res;
+		res = ast_waitstream_fr(chan, AST_DIGIT_ANY,f,r,skipms);
+	return res;
 }
-

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)

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)
 }