[Asterisk-cvs] asterisk app.c,1.18,1.19

[citats at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/home/citats/cvs/asterisk

Modified Files:
	app.c 
Log Message:
More formatting fixes

Index: app.c
===================================================================
RCS file: /usr/cvsroot/asterisk/app.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- app.c	26 May 2004 23:56:41 -0000	1.18
+++ app.c	27 May 2004 00:07:18 -0000	1.19
@@ -407,9 +407,8 @@
 	return res;
 }
 
-int ast_control_streamfile(struct ast_channel *chan, char *file,char *fwd,char *rev,char *stop,char *pause,int skipms) 
+int ast_control_streamfile(struct ast_channel *chan, char *file, char *fwd, char *rev, char *stop, char *pause, int skipms) 
 {
-
 	struct timeval started, ended;
 	long elapsed = 0,last_elapsed =0;
 	char breaks[5];
@@ -418,68 +417,63 @@
 	if (chan->_state != AST_STATE_UP)
 		res = ast_answer(chan);
 
-
-	if(stop != NULL && stop[0]) {
+	if (stop != NULL && stop[0]) {
 		breaks[x++] = stop[0];
 	}
-	if(pause != NULL && pause[0]) {
+	if (pause != NULL && pause[0]) {
 		breaks[x++] = pause[0];
 	}
 	breaks[x] = '\0';
 
-	if(chan)
+	if (chan)
 		ast_stopstream(chan);
 
-	for(;;) {
+	for (;;) {
 		gettimeofday(&started,NULL);
 
-		if(chan)
+		if (chan)
 			ast_stopstream(chan);
 		res = ast_streamfile(chan, file, chan->language);
-		if(!res) {
+		if (!res) {
 			res = 1;
-			if(elapsed) {
-				ast_stream_fastforward(chan->stream,elapsed);
+			if (elapsed) {
+				ast_stream_fastforward(chan->stream, elapsed);
 				last_elapsed = elapsed - 200;
 			}
-			if(res) {
-				res = ast_waitstream_fr(chan,breaks,fwd,rev,skipms);
-			}
-			else {
+			if (res)
+				res = ast_waitstream_fr(chan, breaks, fwd, rev, skipms);
+			else
 				break;
-			}
 		}
 
 		if (res < 1)
 			break;
 
-		if(pause != NULL && res == *pause) {
-			gettimeofday(&ended,NULL);
+		if (pause != NULL && res == *pause) {
+			gettimeofday(&ended, NULL);
 			elapsed = (((ended.tv_sec * 1000) + ended.tv_usec / 1000) - ((started.tv_sec * 1000) + started.tv_usec / 1000) + last_elapsed);
 			for(;;) {
-				if(chan)
+				if (chan)
 					ast_stopstream(chan);
 				res = ast_waitfordigit(chan, 1000);
-				if(res == -1 || res == *pause || (stop && res == *stop))
+				if (res == -1 || res == *pause || (stop && res == *stop))
 					break;
 			}
-			if(res == *pause) {
+			if (res == *pause) {
 				res = 0;
 				continue;
 			}
 		}
-		if(res == -1)
+		if (res == -1)
 			break;
 
-		if(stop != NULL && res == *stop) {
+		if (stop != NULL && res == *stop) {
 			res = 0;
 			break;
 		}
 	}
-	if(chan)
+	if (chan)
 		ast_stopstream(chan);
 
 	return res;
-
 }
-