[Asterisk-cvs] asterisk/channels chan_zap.c, 1.452, 1.453 iax2-parser.c, 1.43, 1.44

[russell at lists.digium.com]

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

Modified Files:
	chan_zap.c iax2-parser.c 
Log Message:
various code cleanups (bug #4353)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -d -r1.452 -r1.453
--- chan_zap.c	24 May 2005 15:30:10 -0000	1.452
+++ chan_zap.c	25 May 2005 10:57:15 -0000	1.453
@@ -267,6 +267,8 @@
 #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 @@
 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: iax2-parser.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/iax2-parser.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- iax2-parser.c	17 May 2005 19:41:09 -0000	1.43
+++ iax2-parser.c	25 May 2005 10:57:15 -0000	1.44
@@ -119,7 +119,7 @@
 		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);
 }