[Asterisk-cvs] asterisk/apps app_controlplayback.c, 1.9, 1.10 app_dictate.c, 1.1, 1.2 app_flash.c, 1.4, 1.5

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv31240/apps

Modified Files:
	app_controlplayback.c app_dictate.c app_flash.c 
Log Message:
various code cleanups (bug #4353)


Index: app_controlplayback.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_controlplayback.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- app_controlplayback.c	21 Apr 2005 06:02:43 -0000	1.9
+++ app_controlplayback.c	25 May 2005 10:57:15 -0000	1.10
@@ -65,24 +65,19 @@
 	file = tmp;
 
 	if ((skip=strchr(tmp,'|'))) {
-		*skip = '\0';
-		*skip++;
+		*skip++ = '\0';
 		fwd=strchr(skip,'|');
 		if (fwd) {
-			*fwd = '\0';
-			*fwd++;
+			*fwd++ = '\0';
 			rev = strchr(fwd,'|');
 			if (rev) {
-				*rev = '\0';
-				*rev++;
+				*rev++ = '\0';
 				stop = strchr(rev,'|');
 				if (stop) {
-					*stop = '\0';
-					*stop++;
+					*stop++ = '\0';
 					pause = strchr(stop,'|');
 					if (pause) {
-						*pause = '\0';
-						*pause++;
+						*pause++ = '\0';
 					}
 				}
 			}

Index: app_dictate.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dictate.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- app_dictate.c	4 May 2005 19:33:33 -0000	1.1
+++ app_dictate.c	25 May 2005 10:57:15 -0000	1.2
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-
+#include <sys/stat.h>	/* for mkdir */
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"

Index: app_flash.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_flash.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- app_flash.c	21 Apr 2005 06:02:43 -0000	1.4
+++ app_flash.c	25 May 2005 10:57:15 -0000	1.5
@@ -11,6 +11,9 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -26,9 +29,6 @@
 #else
 #include <zaptel.h>
 #endif /* __linux__ */
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
 
 static char *tdesc = "Flash zap trunk application";