Index: acl.c
===================================================================
RCS file: /usr/cvsroot/asterisk/acl.c,v
retrieving revision 1.34
diff -u -r1.34 acl.c
--- acl.c	11 Jan 2005 17:08:52 -0000	1.34
+++ acl.c	17 Jan 2005 21:32:20 -0000
@@ -154,12 +154,12 @@
 				ha->netmask.s_addr = htonl(y);
 			}
 		} else if (!inet_aton(nm, &ha->netmask)) {
-			ast_log(LOG_WARNING, "%s not a valid netmask\n", nm);
+			ast_log(LOG_WARNING, "%s is not a valid netmask\n", nm);
 			free(ha);
 			return path;
 		}
 		if (!inet_aton(tmp, &ha->netaddr)) {
-			ast_log(LOG_WARNING, "%s not a valid IP\n", tmp);
+			ast_log(LOG_WARNING, "%s is not a valid IP\n", tmp);
 			free(ha);
 			return path;
 		}
Index: cdr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr.c,v
retrieving revision 1.28
diff -u -r1.28 cdr.c
--- cdr.c	10 Jan 2005 14:46:59 -0000	1.28
+++ cdr.c	17 Jan 2005 21:32:20 -0000
@@ -209,7 +209,7 @@
 				break;
 			default:
 				res = -1;
-				ast_log(LOG_WARNING, "We don't handle that cause yet\n");
+				ast_log(LOG_WARNING, "Cause not handled\n");
 		}
 		cdr = cdr->next;
 	}
Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.164
diff -u -r1.164 channel.c
--- channel.c	10 Jan 2005 14:46:59 -0000	1.164
+++ channel.c	17 Jan 2005 21:32:20 -0000
@@ -916,7 +916,7 @@
 	
 	pfds = alloca(sizeof(struct pollfd) * n);
 	if (!pfds) {
-		ast_log(LOG_WARNING, "alloca failed!  bad things will happen.\n");
+		ast_log(LOG_ERROR, "Out of memory\n");
 		return -1;
 	}
 	if (*ms > 0)
@@ -981,7 +981,7 @@
 
 	pfds = alloca(sizeof(struct pollfd) * (n * AST_MAX_FDS + nfds));
 	if (!pfds) {
-		ast_log(LOG_WARNING, "alloca failed!  bad things will happen.\n");
+		ast_log(LOG_ERROR, "Out of memory\n");
 		*outfd = -1;
 		return NULL;
 	}
Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.629
diff -u -r1.629 chan_sip.c
--- channels/chan_sip.c	12 Jan 2005 15:23:06 -0000	1.629
+++ channels/chan_sip.c	17 Jan 2005 21:32:20 -0000
@@ -5784,8 +5784,8 @@
 /*--- sip_show_inuse: CLI Command to show calls within limits set by 
       outgoinglimit and incominglimit ---*/
 static int sip_show_inuse(int fd, int argc, char *argv[]) {
-#define FORMAT  "%-15.15s %-15.15s %-15.15s %-15.15s %-15.15s\n"
-#define FORMAT2 "%-15.15s %-15.15s %-15.15s %-15.15s %-15.15s\n"
+#define FORMAT  "%-25.25s %-15.15s %-15.15s %-15.15s %-15.15s\n"
+#define FORMAT2 "%-25.25s %-15.15s %-15.15s %-15.15s %-15.15s\n"
 	char ilimits[40] = "";
 	char olimits[40] = "";
 	char iused[40];
@@ -5836,7 +5836,7 @@
 	regex_t regexbuf;
 	int havepattern = 0;
 
-#define FORMAT  "%-15.15s  %-15.15s  %-15.15s %-15.15s %-5.5s%-5.5s\n"
+#define FORMAT  "%-25.25s  %-15.15s  %-15.15s  %-15.15s  %-5.5s%-5.5s\n"
 
 	if (argc > 4)
 		return RESULT_SHOWUSAGE;
@@ -5880,8 +5880,8 @@
 	regex_t regexbuf;
 	int havepattern = 0;
 
-#define FORMAT2 "%-15.15s  %-15.15s %s %s %s %-15.15s  %-8s %-10s\n"
-#define FORMAT  "%-15.15s  %-15.15s %s %s %s %-15.15s  %-8d %-10s\n"
+#define FORMAT2 "%-25.25s  %-15.15s %-3.3s %-3.3s %-3.3s %-15.15s  %-8s %-10s\n"
+#define FORMAT  "%-25.25s  %-15.15s %-3.3s %-3.3s %-3.3s %-15.15s  %-8d %-10s\n"
 
 	char name[256] = "";
 	char iabuf[INET_ADDRSTRLEN];
@@ -6391,24 +6391,24 @@
 					event = 11;
 				else
 					event = atoi(buf);
-                        	if (event < 10) {
-                                	resp = '0' + event;
-                        	} else if (event < 11) {
-                                	resp = '*';
-                        	} else if (event < 12) {
-                                	resp = '#';
-                        	} else if (event < 16) {
-                                	resp = 'A' + (event - 12);
-                        	}
+				if (event < 10) {
+					resp = '0' + event;
+				} else if (event < 11) {
+					resp = '*';
+				} else if (event < 12) {
+					resp = '#';
+				} else if (event < 16) {
+					resp = 'A' + (event - 12);
+				}
 				/* Build DTMF frame and deliver to PBX for transmission to other call leg*/
-                        	memset(&f, 0, sizeof(f));
-                        	f.frametype = AST_FRAME_DTMF;
-                        	f.subclass = resp;
-                        	f.offset = 0;
-                        	f.data = NULL;
-                        	f.datalen = 0;
-                        	ast_queue_frame(p->owner, &f);
-		   	}
+				memset(&f, 0, sizeof(f));
+				f.frametype = AST_FRAME_DTMF;
+				f.subclass = resp;
+				f.offset = 0;
+				f.data = NULL;
+				f.datalen = 0;
+				ast_queue_frame(p->owner, &f);
+			}
 		   	transmit_response(p, "200 OK", req);
 		   	return;
 		} else {
@@ -9249,8 +9259,8 @@
 		if (sipsock < 0) {
 			ast_log(LOG_WARNING, "Unable to create SIP socket: %s\n", strerror(errno));
 		} else {
-		        /* Allow SIP clients on the same host to access us: */
-		        const int reuseFlag = 1;
+			/* Allow SIP clients on the same host to access us: */
+			const int reuseFlag = 1;
 			setsockopt(sipsock, SOL_SOCKET, SO_REUSEADDR,
 				   (const char*)&reuseFlag,
 				   sizeof reuseFlag);
Index: include/asterisk/cdr.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/cdr.h,v
retrieving revision 1.17
diff -u -r1.17 cdr.h
--- include/asterisk/cdr.h	10 Jan 2005 14:46:59 -0000	1.17
+++ include/asterisk/cdr.h	17 Jan 2005 21:32:20 -0000
@@ -41,7 +41,7 @@
 //! Responsible for call detail data
 struct ast_cdr {
 	/*! Caller*ID with text */
-	char clid[AST_MAX_EXTENSION];		
+	char clid[AST_MAX_EXTENSION];
 	/*! Caller*ID number */
 	char src[AST_MAX_EXTENSION];		
 	/*! Destination extension */