various code cleanups (bug #4353)
authorRussell Bryant <russell@russellbryant.com>
Wed, 25 May 2005 10:57:15 +0000 (10:57 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 25 May 2005 10:57:15 +0000 (10:57 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5764 65c4cc65-6c06-0410-ace0-fbb531ad65f3

app.c
apps/app_controlplayback.c
apps/app_dictate.c
apps/app_flash.c
channels/chan_zap.c
channels/iax2-parser.c
config.c

diff --git a/app.c b/app.c
index cce0cbe..93273b1 100755 (executable)
--- a/app.c
+++ b/app.c
@@ -271,7 +271,7 @@ int ast_dtmf_stream(struct ast_channel *chan,struct ast_channel *peer,char *digi
        if (!res) {
                res = ast_waitfor(chan,100);
                if (res > -1) {
-                       for (ptr=digits;*ptr;*ptr++) {
+                       for (ptr=digits; *ptr; ptr++) {
                                if (*ptr == 'w') {
                                        res = ast_safe_sleep(chan, 500);
                                        if (res) 
index bf56dca..02a1cd3 100755 (executable)
@@ -65,24 +65,19 @@ static int controlplayback_exec(struct ast_channel *chan, void *data)
        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 b88fbf2..97efef1 100755 (executable)
@@ -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 9c8e8db..7514ef0 100755 (executable)
@@ -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";
 
index 758429c..bb3e37a 100755 (executable)
@@ -267,6 +267,8 @@ static struct ast_channel inuse = { "GR-303InUse" };
 #ifdef PRI_GETSET_TIMERS
 static int pritimers[PRI_MAX_TIMERS];
 #endif
+static int pridebugfd = -1;
+static char pridebugfilename[1024]="";
 #endif
 
 /* Wait up to 16 seconds for first digit (FXO logic) */
@@ -288,8 +290,6 @@ AST_MUTEX_DEFINE_STATIC(iflock);
 static int ifcount = 0;
 
 AST_MUTEX_DEFINE_STATIC(pridebugfdlock);
-static int pridebugfd = -1;
-static char pridebugfilename[1024]="";
 
 /* Whether we answer on a Polarity Switch event */
 static int answeronpolarityswitch = 0;
index 1851b4a..cb21253 100755 (executable)
@@ -119,7 +119,7 @@ static void dump_datetime(char *output, int maxlen, void *value, int len)
                tm.tm_mday = (val >> 16) & 0x1f;
                tm.tm_mon  = ((val >> 21) & 0x0f) - 1;
                tm.tm_year = ((val >> 25) & 0x7f) + 100;
-               strftime(output, maxlen, "%F  %T", &tm); 
+               strftime(output, maxlen, "%Y-%m-%d  %T", &tm); 
        } else
                ast_copy_string(output, "Invalid DATETIME format!", maxlen);
 }
index 6a86b6e..b375669 100755 (executable)
--- a/config.c
+++ b/config.c
@@ -486,7 +486,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
                                /* #exec </path/to/executable>
                                   We create a tmp file, then we #include it, then we delete it. */
                                if (do_exec) { 
-                                       snprintf(exec_file, sizeof(exec_file), "/var/tmp/exec.%ld.%ld", time(NULL), pthread_self());
+                                       snprintf(exec_file, sizeof(exec_file), "/var/tmp/exec.%ld.%ld", time(NULL), (long)pthread_self());
                                        snprintf(cmd, sizeof(cmd), "%s > %s 2>&1", cur, exec_file);
                                        ast_safe_system(cmd);
                                        cur = exec_file;