Remove as much trailing whitespace as possible.

Change-Id: I873c1c6d00f447269bd841494459efccdd2c19c0

51 files changed, 316 insertions, 357 deletions

diff --git a/main/acl.c b/main/acl.c
index 43035329c..1d628e6b2 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -1028,4 +1028,3 @@ int ast_find_ourip(struct ast_sockaddr *ourip, const struct ast_sockaddr *bindad
 	ast_sockaddr_set_port(ourip, port);
 	return res;
 }
-
diff --git a/main/alaw.c b/main/alaw.c
index c5069f358..ced9f16a2 100644
--- a/main/alaw.c
+++ b/main/alaw.c
@@ -214,4 +214,3 @@ void ast_alaw_init(void)
 #endif /* TEST_TANDEM_TRANSCODING */
 
 }
-
diff --git a/main/app.c b/main/app.c
index f01d06513..331c82750 100644
--- a/main/app.c
+++ b/main/app.c
@@ -3440,4 +3440,3 @@ int app_init(void)
 	}
 	return 0;
 }
-
diff --git a/main/ast_expr2.c b/main/ast_expr2.c
index 1b866facf..4699b46ce 100644
--- a/main/ast_expr2.c
+++ b/main/ast_expr2.c
@@ -2,20 +2,20 @@
 /* A Bison parser, made by GNU Bison 2.4.1.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-   
+
       Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -28,7 +28,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -78,14 +78,14 @@
 /* Line 189 of yacc.c  */
 #line 1 "ast_expr2.y"
 
-/* Written by Pace Willisson (pace@blitz.com) 
+/* Written by Pace Willisson (pace@blitz.com)
  * and placed in the public domain.
  *
  * Largely rewritten by J.T. Conklin (jtc@wimsey.com)
  *
  * And then overhauled twice by Steve Murphy (murf@digium.com)
  * to add double-quoted strings, allow mult. spaces, improve
- * error messages, and then to fold in a flex scanner for the 
+ * error messages, and then to fold in a flex scanner for the
  * yylex operation.
  *
  * $FreeBSD: src/bin/expr/expr.y,v 1.16 2000/07/22 10:59:36 se Exp $
@@ -98,7 +98,7 @@
 #include <stdio.h>
 
 #if !defined(STANDALONE) && !defined(STANDALONE2)	\
-	
+
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #else
 #ifndef __USE_ISOC99
@@ -337,7 +337,7 @@ enum node_type {
 	AST_EXPR_NODE_COMMA, AST_EXPR_NODE_STRING, AST_EXPR_NODE_VAL
 } ;
 
-struct expr_node 
+struct expr_node
 {
 	enum node_type type;
 	struct val *val;
@@ -355,7 +355,7 @@ struct parse_io
 	yyscan_t scanner;
 	struct ast_channel *chan;
 };
- 
+
 static int		chk_div __P((FP___TYPE, FP___TYPE));
 static int		chk_minus __P((FP___TYPE, FP___TYPE, FP___TYPE));
 static int		chk_plus __P((FP___TYPE, FP___TYPE, FP___TYPE));
@@ -407,7 +407,7 @@ typedef struct yyltype
    define it here, we have no definition yet for YYSTYPE. */
 
 int		ast_yyerror(const char *,YYLTYPE *, struct parse_io *);
- 
+
 /* I wanted to add args to the yyerror routine, so I could print out
    some useful info about the error. Not as easy as it looks, but it
    is possible. */
@@ -1229,7 +1229,7 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
+
 
 #if YYERROR_VERBOSE
 
@@ -1440,7 +1440,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
     }
 }
 #endif /* YYERROR_VERBOSE */
-
+
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -2011,7 +2011,7 @@ yyreduce:
               if( (yyvsp[(1) - (1)].val)->type == AST_EXPR_number )
 				  ((struct parse_io *)parseio)->val->u.i = (yyvsp[(1) - (1)].val)->u.i;
               else
-				  ((struct parse_io *)parseio)->val->u.s = (yyvsp[(1) - (1)].val)->u.s; 
+				  ((struct parse_io *)parseio)->val->u.s = (yyvsp[(1) - (1)].val)->u.s;
 			  free((yyvsp[(1) - (1)].val));
 			;}
     break;
@@ -2022,7 +2022,7 @@ yyreduce:
 #line 382 "ast_expr2.y"
     {/* nothing */ ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(struct val),1);
               ((struct parse_io *)parseio)->val->type = AST_EXPR_string;
-			  ((struct parse_io *)parseio)->val->u.s = strdup(""); 
+			  ((struct parse_io *)parseio)->val->u.s = strdup("");
 			;}
     break;
 
@@ -2081,7 +2081,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 412 "ast_expr2.y"
     { (yyval.val) = (yyvsp[(2) - (3)].val);
-	                       (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+	                       (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						   (yyloc).first_line=0; (yyloc).last_line=0;
 							DESTROY((yyvsp[(1) - (3)].val)); DESTROY((yyvsp[(3) - (3)].val)); ;}
     break;
@@ -2091,8 +2091,8 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 416 "ast_expr2.y"
     { (yyval.val) = op_or ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
-						DESTROY((yyvsp[(2) - (3)].val));	
-                         (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+						DESTROY((yyvsp[(2) - (3)].val));
+                         (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						 (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2100,9 +2100,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 420 "ast_expr2.y"
-    { (yyval.val) = op_and ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_and ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
                           (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2111,7 +2111,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 424 "ast_expr2.y"
     { (yyval.val) = op_eq ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
-						DESTROY((yyvsp[(2) - (3)].val));	
+						DESTROY((yyvsp[(2) - (3)].val));
 	                     (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						 (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
@@ -2121,7 +2121,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 428 "ast_expr2.y"
     { (yyval.val) = op_gt ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
-						DESTROY((yyvsp[(2) - (3)].val));	
+						DESTROY((yyvsp[(2) - (3)].val));
                          (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						 (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
@@ -2130,9 +2130,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 432 "ast_expr2.y"
-    { (yyval.val) = op_lt ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                     (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_lt ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                     (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						 (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2140,9 +2140,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 436 "ast_expr2.y"
-    { (yyval.val) = op_ge ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_ge ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						  (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2150,9 +2150,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 440 "ast_expr2.y"
-    { (yyval.val) = op_le ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_le ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						  (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2160,9 +2160,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 444 "ast_expr2.y"
-    { (yyval.val) = op_ne ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_ne ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						  (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2170,9 +2170,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 448 "ast_expr2.y"
-    { (yyval.val) = op_plus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                       (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_plus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                       (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						   (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2180,9 +2180,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 452 "ast_expr2.y"
-    { (yyval.val) = op_minus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                        (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_minus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                        (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 							(yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2190,9 +2190,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 456 "ast_expr2.y"
-    { (yyval.val) = op_negate ((yyvsp[(2) - (2)].val)); 
-						DESTROY((yyvsp[(1) - (2)].val));	
-	                        (yyloc).first_column = (yylsp[(1) - (2)]).first_column; (yyloc).last_column = (yylsp[(2) - (2)]).last_column; 
+    { (yyval.val) = op_negate ((yyvsp[(2) - (2)].val));
+						DESTROY((yyvsp[(1) - (2)].val));
+	                        (yyloc).first_column = (yylsp[(1) - (2)]).first_column; (yyloc).last_column = (yylsp[(2) - (2)]).last_column;
 							(yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2200,9 +2200,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 460 "ast_expr2.y"
-    { (yyval.val) = op_compl ((yyvsp[(2) - (2)].val)); 
-						DESTROY((yyvsp[(1) - (2)].val));	
-	                        (yyloc).first_column = (yylsp[(1) - (2)]).first_column; (yyloc).last_column = (yylsp[(2) - (2)]).last_column; 
+    { (yyval.val) = op_compl ((yyvsp[(2) - (2)].val));
+						DESTROY((yyvsp[(1) - (2)].val));
+	                        (yyloc).first_column = (yylsp[(1) - (2)]).first_column; (yyloc).last_column = (yylsp[(2) - (2)]).last_column;
 							(yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2210,9 +2210,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 464 "ast_expr2.y"
-    { (yyval.val) = op_times ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                       (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_times ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                       (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						   (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2220,9 +2220,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 468 "ast_expr2.y"
-    { (yyval.val) = op_div ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_div ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						  (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2230,9 +2230,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 472 "ast_expr2.y"
-    { (yyval.val) = op_rem ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_rem ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                      (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 						  (yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2240,9 +2240,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 476 "ast_expr2.y"
-    { (yyval.val) = op_colon ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                        (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_colon ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                        (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 							(yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2250,9 +2250,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 480 "ast_expr2.y"
-    { (yyval.val) = op_eqtilde ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                        (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_eqtilde ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                        (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 							(yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2260,10 +2260,10 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 484 "ast_expr2.y"
-    { (yyval.val) = op_cond ((yyvsp[(1) - (5)].val), (yyvsp[(3) - (5)].val), (yyvsp[(5) - (5)].val)); 
-						DESTROY((yyvsp[(2) - (5)].val));	
-						DESTROY((yyvsp[(4) - (5)].val));	
-	                        (yyloc).first_column = (yylsp[(1) - (5)]).first_column; (yyloc).last_column = (yylsp[(3) - (5)]).last_column; 
+    { (yyval.val) = op_cond ((yyvsp[(1) - (5)].val), (yyvsp[(3) - (5)].val), (yyvsp[(5) - (5)].val));
+						DESTROY((yyvsp[(2) - (5)].val));
+						DESTROY((yyvsp[(4) - (5)].val));
+	                        (yyloc).first_column = (yylsp[(1) - (5)]).first_column; (yyloc).last_column = (yylsp[(3) - (5)]).last_column;
 							(yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2271,9 +2271,9 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 489 "ast_expr2.y"
-    { (yyval.val) = op_tildetilde ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); 
-						DESTROY((yyvsp[(2) - (3)].val));	
-	                        (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; 
+    { (yyval.val) = op_tildetilde ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
+						DESTROY((yyvsp[(2) - (3)].val));
+	                        (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;
 							(yyloc).first_line=0; (yyloc).last_line=0;;}
     break;
 
@@ -2528,7 +2528,7 @@ make_number (FP___TYPE i)
 
 	vp->type = AST_EXPR_number;
 	vp->u.i  = i;
-	return vp; 
+	return vp;
 }
 
 static struct val *
@@ -2556,7 +2556,7 @@ make_str (const char *s)
 	}
 	if (isint)
 		vp->type = AST_EXPR_numeric_string;
-	else	
+	else
 		vp->type = AST_EXPR_string;
 
 	return vp;
@@ -2565,12 +2565,12 @@ make_str (const char *s)
 
 static void
 free_value (struct val *vp)
-{	
+{
 	if (vp==NULL) {
 		return;
 	}
 	if (vp->type == AST_EXPR_string || vp->type == AST_EXPR_numeric_string)
-		free (vp->u.s);	
+		free (vp->u.s);
 	free(vp);
 }
 
@@ -2579,7 +2579,7 @@ static int
 to_number (struct val *vp)
 {
 	FP___TYPE i;
-	
+
 	if (vp == NULL) {
 		ast_log(LOG_WARNING,"vp==NULL in to_number()\n");
 		return(0);
@@ -2611,13 +2611,13 @@ strip_quotes(struct val *vp)
 {
 	if (vp->type != AST_EXPR_string && vp->type != AST_EXPR_numeric_string)
 		return;
-	
+
 	if( vp->u.s[0] == '"' && vp->u.s[strlen(vp->u.s)-1] == '"' )
 	{
 		char *f, *t;
 		f = vp->u.s;
 		t = vp->u.s;
-		
+
 		while( *f )
 		{
 			if( *f  && *f != '"' )
@@ -2672,7 +2672,7 @@ void ast_log(int level, const char *file, int line, const char *function, const
 {
 	va_list vars;
 	va_start(vars,fmt);
-	
+
         printf("LOG: lev:%d file:%s  line:%d func: %s  ",
                    level, file, line, function);
 	vprintf(fmt, vars);
@@ -2685,14 +2685,14 @@ int main(int argc,char **argv) {
 	char s[4096];
 	char out[4096];
 	FILE *infile;
-	
+
 	if( !argv[1] )
 		exit(20);
-	
+
 	if( access(argv[1],F_OK)== 0 )
 	{
 		int ret;
-		
+
 		infile = fopen(argv[1],"r");
 		if( !infile )
 		{
@@ -2703,7 +2703,7 @@ int main(int argc,char **argv) {
 		{
 			if( s[strlen(s)-1] == '\n' )
 				s[strlen(s)-1] = 0;
-			
+
 			ret = ast_expr(s, out, sizeof(out), NULL);
 			printf("Expression: %s    Result: [%d] '%s'\n",
 				   s, ret, out);
@@ -2733,7 +2733,7 @@ int main(int argc,char **argv) {
 static void destroy_arglist(struct expr_node *arglist)
 {
 	struct expr_node *arglist_next;
-	
+
 	while (arglist)
 	{
 		arglist_next = arglist->right;
@@ -2752,7 +2752,7 @@ static char *compose_func_args(struct expr_node *arglist)
 	struct expr_node *t = arglist;
 	char *argbuf;
 	int total_len = 0;
-	
+
 	while (t) {
 		if (t != arglist)
 			total_len += 1; /* for the sep */
@@ -2762,7 +2762,7 @@ static char *compose_func_args(struct expr_node *arglist)
 			else
 				total_len += strlen(t->val->u.s);
 		}
-		
+
 		t = t->right;
 	}
 	total_len++; /* for the null */
@@ -2772,10 +2772,10 @@ static char *compose_func_args(struct expr_node *arglist)
 	t = arglist;
 	while (t) {
 		char numbuf[30];
-		
+
 		if (t != arglist)
 			strcat(argbuf,",");
-		
+
 		if (t->val) {
 			if (t->val->type == AST_EXPR_number) {
 				sprintf(numbuf,FP___PRINTF,t->val->u.i);
@@ -3055,7 +3055,7 @@ static struct val *op_func(struct val *funcname, struct expr_node *arglist, stru
 				ast_log(LOG_WARNING,"Hey! chan is NULL.\n");
 			if (!f)
 				ast_log(LOG_WARNING,"Hey! could not find func %s.\n", funcname->u.s);
-			
+
 			if (f && chan) {
 				if (f->read) {
 					char workspace[512];
@@ -3070,7 +3070,7 @@ static struct val *op_func(struct val *funcname, struct expr_node *arglist, stru
 					ast_log(LOG_ERROR,"Error! Function '%s' cannot be read!\n", funcname->u.s);
 					return (make_number ((FP___TYPE)0.0));
 				}
-				
+
 			} else {
 				ast_log(LOG_ERROR, "Error! '%s' doesn't appear to be an available function!\n", funcname->u.s);
 				return (make_number ((FP___TYPE)0.0));
@@ -3101,7 +3101,7 @@ op_or (struct val *a, struct val *b)
 		return (a);
 	}
 }
-		
+
 static struct val *
 op_and (struct val *a, struct val *b)
 {
@@ -3118,11 +3118,11 @@ op_and (struct val *a, struct val *b)
 static struct val *
 op_eq (struct val *a, struct val *b)
 {
-	struct val *r; 
+	struct val *r;
 
 	if (isstring (a) || isstring (b)) {
 		to_string (a);
-		to_string (b);	
+		to_string (b);
 		r = make_number ((FP___TYPE)(strcoll (a->u.s, b->u.s) == 0));
 	} else {
 #ifdef DEBUG_FOR_CONVERSIONS
@@ -3397,7 +3397,7 @@ op_compl (struct val *a)
 {
 	int v1 = 1;
 	struct val *r;
-	
+
 	if( !a )
 	{
 		v1 = 0;
@@ -3410,7 +3410,7 @@ op_compl (struct val *a)
 			if( a->u.i == 0 )
 				v1 = 0;
 			break;
-			
+
 		case AST_EXPR_string:
 			if( a->u.s == 0 )
 				v1 = 0;
@@ -3424,7 +3424,7 @@ op_compl (struct val *a)
 					v1 = atoi(a->u.s);
 			}
 			break;
-			
+
 		case AST_EXPR_numeric_string:
 			if( a->u.s == 0 )
 				v1 = 0;
@@ -3440,7 +3440,7 @@ op_compl (struct val *a)
 			break;
 		}
 	}
-	
+
 	r = make_number (!v1);
 	free_value (a);
 	return r;
@@ -3511,7 +3511,7 @@ op_div (struct val *a, struct val *b)
 	}
 
 	if (b->u.i == 0) {
-		ast_log(LOG_WARNING, "division by zero\n");		
+		ast_log(LOG_WARNING, "division by zero\n");
 		free_value(a);
 		free_value(b);
 		return make_number(INT_MAX);
@@ -3525,7 +3525,7 @@ op_div (struct val *a, struct val *b)
 	free_value (b);
 	return r;
 }
-	
+
 static struct val *
 op_rem (struct val *a, struct val *b)
 {
@@ -3551,7 +3551,7 @@ op_rem (struct val *a, struct val *b)
 	free_value (b);
 	return r;
 }
-	
+
 
 static struct val *
 op_colon (struct val *a, struct val *b)
@@ -3574,7 +3574,7 @@ op_colon (struct val *a, struct val *b)
 		ast_log(LOG_WARNING, "regcomp() error : %s\n", errbuf);
 		free_value(a);
 		free_value(b);
-		return make_str("");		
+		return make_str("");
 	}
 
 	/* compare string against pattern */
@@ -3602,7 +3602,7 @@ op_colon (struct val *a, struct val *b)
 
 	return v;
 }
-	
+
 
 static struct val *
 op_eqtilde (struct val *a, struct val *b)
@@ -3625,7 +3625,7 @@ op_eqtilde (struct val *a, struct val *b)
 		ast_log(LOG_WARNING, "regcomp() error : %s\n", errbuf);
 		free_value(a);
 		free_value(b);
-		return make_str("");		
+		return make_str("");
 	}
 
 	/* compare string against pattern */
@@ -3688,4 +3688,3 @@ op_tildetilde (struct val *a, struct val *b)
 
 	return v;
 }
-
diff --git a/main/ast_expr2.h b/main/ast_expr2.h
index 1fefe11f7..628283405 100644
--- a/main/ast_expr2.h
+++ b/main/ast_expr2.h
@@ -2,20 +2,20 @@
 /* A Bison parser, made by GNU Bison 2.4.1.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
-   
+
       Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -28,7 +28,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -101,6 +101,3 @@ typedef struct YYLTYPE
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
-
-
-
diff --git a/main/ast_expr2.y b/main/ast_expr2.y
index 7163a7132..08ed76a43 100644
--- a/main/ast_expr2.y
+++ b/main/ast_expr2.y
@@ -1,12 +1,12 @@
 %{
-/* Written by Pace Willisson (pace@blitz.com) 
+/* Written by Pace Willisson (pace@blitz.com)
  * and placed in the public domain.
  *
  * Largely rewritten by J.T. Conklin (jtc@wimsey.com)
  *
  * And then overhauled twice by Steve Murphy (murf@digium.com)
  * to add double-quoted strings, allow mult. spaces, improve
- * error messages, and then to fold in a flex scanner for the 
+ * error messages, and then to fold in a flex scanner for the
  * yylex operation.
  *
  * $FreeBSD: src/bin/expr/expr.y,v 1.16 2000/07/22 10:59:36 se Exp $
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #if !defined(STANDALONE) && !defined(STANDALONE2)	\
-	
+
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #else
 #ifndef __USE_ISOC99
@@ -258,7 +258,7 @@ enum node_type {
 	AST_EXPR_NODE_COMMA, AST_EXPR_NODE_STRING, AST_EXPR_NODE_VAL
 } ;
 
-struct expr_node 
+struct expr_node
 {
 	enum node_type type;
 	struct val *val;
@@ -276,7 +276,7 @@ struct parse_io
 	yyscan_t scanner;
 	struct ast_channel *chan;
 };
- 
+
 static int		chk_div __P((FP___TYPE, FP___TYPE));
 static int		chk_minus __P((FP___TYPE, FP___TYPE, FP___TYPE));
 static int		chk_plus __P((FP___TYPE, FP___TYPE, FP___TYPE));
@@ -328,14 +328,14 @@ typedef struct yyltype
    define it here, we have no definition yet for YYSTYPE. */
 
 int		ast_yyerror(const char *,YYLTYPE *, struct parse_io *);
- 
+
 /* I wanted to add args to the yyerror routine, so I could print out
    some useful info about the error. Not as easy as it looks, but it
    is possible. */
 #define ast_yyerror(x) ast_yyerror(x,&yyloc,parseio)
 #define DESTROY(x) {if((x)->type == AST_EXPR_numeric_string || (x)->type == AST_EXPR_string) free((x)->u.s); (x)->u.s = 0; free(x);}
 %}
- 
+
 %pure-parser
 %locations
 /* %debug  for when you are having big problems */
@@ -357,7 +357,7 @@ extern int		ast_yylex __P((YYSTYPE *, YYLTYPE *, yyscan_t));
 %left <val> TOK_AND
 %left <val> TOK_EQ TOK_GT TOK_LT TOK_GE TOK_LE TOK_NE
 %left <val> TOK_PLUS TOK_MINUS
-%left <val> TOK_MULT TOK_DIV TOK_MOD 
+%left <val> TOK_MULT TOK_DIV TOK_MOD
 %right <val> TOK_COMPL
 %left <val> TOK_COLON TOK_EQTILDE TOK_TILDETILDE
 %left <val> TOK_RP TOK_LP
@@ -366,8 +366,8 @@ extern int		ast_yylex __P((YYSTYPE *, YYLTYPE *, yyscan_t));
 %type <arglist> arglist
 %type <val> start expr
 
-%destructor {  free_value($$); }  expr TOKEN TOK_COND TOK_COLONCOLON TOK_OR TOK_AND TOK_EQ 
-                                 TOK_GT TOK_LT TOK_GE TOK_LE TOK_NE TOK_PLUS TOK_MINUS TOK_MULT TOK_DIV TOK_MOD TOK_COMPL TOK_COLON TOK_EQTILDE 
+%destructor {  free_value($$); }  expr TOKEN TOK_COND TOK_COLONCOLON TOK_OR TOK_AND TOK_EQ
+                                 TOK_GT TOK_LT TOK_GE TOK_LE TOK_NE TOK_PLUS TOK_MINUS TOK_MULT TOK_DIV TOK_MOD TOK_COMPL TOK_COLON TOK_EQTILDE
                                  TOK_RP TOK_LP TOK_TILDETILDE
 
 %%
@@ -377,12 +377,12 @@ start: expr { ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(st
               if( $1->type == AST_EXPR_number )
 				  ((struct parse_io *)parseio)->val->u.i = $1->u.i;
               else
-				  ((struct parse_io *)parseio)->val->u.s = $1->u.s; 
+				  ((struct parse_io *)parseio)->val->u.s = $1->u.s;
 			  free($1);
 			}
 	| {/* nothing */ ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(struct val),1);
               ((struct parse_io *)parseio)->val->type = AST_EXPR_string;
-			  ((struct parse_io *)parseio)->val->u.s = strdup(""); 
+			  ((struct parse_io *)parseio)->val->u.s = strdup("");
 			}
 
 	;
@@ -402,7 +402,7 @@ arglist: expr { $$ = alloc_expr_node(AST_EXPR_NODE_VAL); $$->val = $1;}
                                  $$ = $1; t->right = x; x->val = make_str("");}
        ;
 
-expr: 
+expr:
       TOKEN TOK_LP arglist TOK_RP { $$ = op_func($1,$3, ((struct parse_io *)parseio)->chan);
 		                            DESTROY($2);
 									DESTROY($4);
@@ -411,85 +411,85 @@ expr:
                                   }
     | TOKEN {$$ = $1;}
 	| TOK_LP expr TOK_RP { $$ = $2;
-	                       @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	                       @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						   @$.first_line=0; @$.last_line=0;
 							DESTROY($1); DESTROY($3); }
 	| expr TOK_OR expr { $$ = op_or ($1, $3);
-						DESTROY($2);	
-                         @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+						DESTROY($2);
+                         @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						 @$.first_line=0; @$.last_line=0;}
-	| expr TOK_AND expr { $$ = op_and ($1, $3); 
-						DESTROY($2);	
-	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_AND expr { $$ = op_and ($1, $3);
+						DESTROY($2);
+	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column;
                           @$.first_line=0; @$.last_line=0;}
 	| expr TOK_EQ expr { $$ = op_eq ($1, $3);
-						DESTROY($2);	
+						DESTROY($2);
 	                     @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						 @$.first_line=0; @$.last_line=0;}
 	| expr TOK_GT expr { $$ = op_gt ($1, $3);
-						DESTROY($2);	
+						DESTROY($2);
                          @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						 @$.first_line=0; @$.last_line=0;}
-	| expr TOK_LT expr { $$ = op_lt ($1, $3); 
-						DESTROY($2);	
-	                     @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_LT expr { $$ = op_lt ($1, $3);
+						DESTROY($2);
+	                     @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						 @$.first_line=0; @$.last_line=0;}
-	| expr TOK_GE expr  { $$ = op_ge ($1, $3); 
-						DESTROY($2);	
-	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_GE expr  { $$ = op_ge ($1, $3);
+						DESTROY($2);
+	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						  @$.first_line=0; @$.last_line=0;}
-	| expr TOK_LE expr  { $$ = op_le ($1, $3); 
-						DESTROY($2);	
-	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_LE expr  { $$ = op_le ($1, $3);
+						DESTROY($2);
+	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						  @$.first_line=0; @$.last_line=0;}
-	| expr TOK_NE expr  { $$ = op_ne ($1, $3); 
-						DESTROY($2);	
-	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_NE expr  { $$ = op_ne ($1, $3);
+						DESTROY($2);
+	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						  @$.first_line=0; @$.last_line=0;}
-	| expr TOK_PLUS expr { $$ = op_plus ($1, $3); 
-						DESTROY($2);	
-	                       @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_PLUS expr { $$ = op_plus ($1, $3);
+						DESTROY($2);
+	                       @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						   @$.first_line=0; @$.last_line=0;}
-	| expr TOK_MINUS expr { $$ = op_minus ($1, $3); 
-						DESTROY($2);	
-	                        @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_MINUS expr { $$ = op_minus ($1, $3);
+						DESTROY($2);
+	                        @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 							@$.first_line=0; @$.last_line=0;}
-	| TOK_MINUS expr %prec TOK_COMPL { $$ = op_negate ($2); 
-						DESTROY($1);	
-	                        @$.first_column = @1.first_column; @$.last_column = @2.last_column; 
+	| TOK_MINUS expr %prec TOK_COMPL { $$ = op_negate ($2);
+						DESTROY($1);
+	                        @$.first_column = @1.first_column; @$.last_column = @2.last_column;
 							@$.first_line=0; @$.last_line=0;}
-	| TOK_COMPL expr   { $$ = op_compl ($2); 
-						DESTROY($1);	
-	                        @$.first_column = @1.first_column; @$.last_column = @2.last_column; 
+	| TOK_COMPL expr   { $$ = op_compl ($2);
+						DESTROY($1);
+	                        @$.first_column = @1.first_column; @$.last_column = @2.last_column;
 							@$.first_line=0; @$.last_line=0;}
-	| expr TOK_MULT expr { $$ = op_times ($1, $3); 
-						DESTROY($2);	
-	                       @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_MULT expr { $$ = op_times ($1, $3);
+						DESTROY($2);
+	                       @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						   @$.first_line=0; @$.last_line=0;}
-	| expr TOK_DIV expr { $$ = op_div ($1, $3); 
-						DESTROY($2);	
-	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_DIV expr { $$ = op_div ($1, $3);
+						DESTROY($2);
+	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						  @$.first_line=0; @$.last_line=0;}
-	| expr TOK_MOD expr { $$ = op_rem ($1, $3); 
-						DESTROY($2);	
-	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_MOD expr { $$ = op_rem ($1, $3);
+						DESTROY($2);
+	                      @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 						  @$.first_line=0; @$.last_line=0;}
-	| expr TOK_COLON expr { $$ = op_colon ($1, $3); 
-						DESTROY($2);	
-	                        @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_COLON expr { $$ = op_colon ($1, $3);
+						DESTROY($2);
+	                        @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 							@$.first_line=0; @$.last_line=0;}
-	| expr TOK_EQTILDE expr { $$ = op_eqtilde ($1, $3); 
-						DESTROY($2);	
-	                        @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_EQTILDE expr { $$ = op_eqtilde ($1, $3);
+						DESTROY($2);
+	                        @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 							@$.first_line=0; @$.last_line=0;}
-	| expr TOK_COND expr TOK_COLONCOLON expr  { $$ = op_cond ($1, $3, $5); 
-						DESTROY($2);	
-						DESTROY($4);	
-	                        @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_COND expr TOK_COLONCOLON expr  { $$ = op_cond ($1, $3, $5);
+						DESTROY($2);
+						DESTROY($4);
+	                        @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 							@$.first_line=0; @$.last_line=0;}
-	| expr TOK_TILDETILDE expr { $$ = op_tildetilde ($1, $3); 
-						DESTROY($2);	
-	                        @$.first_column = @1.first_column; @$.last_column = @3.last_column; 
+	| expr TOK_TILDETILDE expr { $$ = op_tildetilde ($1, $3);
+						DESTROY($2);
+	                        @$.first_column = @1.first_column; @$.last_column = @3.last_column;
 							@$.first_line=0; @$.last_line=0;}
 	;
 
@@ -521,7 +521,7 @@ make_number (FP___TYPE i)
 
 	vp->type = AST_EXPR_number;
 	vp->u.i  = i;
-	return vp; 
+	return vp;
 }
 
 static struct val *
@@ -549,7 +549,7 @@ make_str (const char *s)
 	}
 	if (isint)
 		vp->type = AST_EXPR_numeric_string;
-	else	
+	else
 		vp->type = AST_EXPR_string;
 
 	return vp;
@@ -558,12 +558,12 @@ make_str (const char *s)
 
 static void
 free_value (struct val *vp)
-{	
+{
 	if (vp==NULL) {
 		return;
 	}
 	if (vp->type == AST_EXPR_string || vp->type == AST_EXPR_numeric_string)
-		free (vp->u.s);	
+		free (vp->u.s);
 	free(vp);
 }
 
@@ -572,7 +572,7 @@ static int
 to_number (struct val *vp)
 {
 	FP___TYPE i;
-	
+
 	if (vp == NULL) {
 		ast_log(LOG_WARNING,"vp==NULL in to_number()\n");
 		return(0);
@@ -604,13 +604,13 @@ strip_quotes(struct val *vp)
 {
 	if (vp->type != AST_EXPR_string && vp->type != AST_EXPR_numeric_string)
 		return;
-	
+
 	if( vp->u.s[0] == '"' && vp->u.s[strlen(vp->u.s)-1] == '"' )
 	{
 		char *f, *t;
 		f = vp->u.s;
 		t = vp->u.s;
-		
+
 		while( *f )
 		{
 			if( *f  && *f != '"' )
@@ -665,7 +665,7 @@ void ast_log(int level, const char *file, int line, const char *function, const
 {
 	va_list vars;
 	va_start(vars,fmt);
-	
+
         printf("LOG: lev:%d file:%s  line:%d func: %s  ",
                    level, file, line, function);
 	vprintf(fmt, vars);
@@ -678,14 +678,14 @@ int main(int argc,char **argv) {
 	char s[4096];
 	char out[4096];
 	FILE *infile;
-	
+
 	if( !argv[1] )
 		exit(20);
-	
+
 	if( access(argv[1],F_OK)== 0 )
 	{
 		int ret;
-		
+
 		infile = fopen(argv[1],"r");
 		if( !infile )
 		{
@@ -696,7 +696,7 @@ int main(int argc,char **argv) {
 		{
 			if( s[strlen(s)-1] == '\n' )
 				s[strlen(s)-1] = 0;
-			
+
 			ret = ast_expr(s, out, sizeof(out), NULL);
 			printf("Expression: %s    Result: [%d] '%s'\n",
 				   s, ret, out);
@@ -726,7 +726,7 @@ int main(int argc,char **argv) {
 static void destroy_arglist(struct expr_node *arglist)
 {
 	struct expr_node *arglist_next;
-	
+
 	while (arglist)
 	{
 		arglist_next = arglist->right;
@@ -745,7 +745,7 @@ static char *compose_func_args(struct expr_node *arglist)
 	struct expr_node *t = arglist;
 	char *argbuf;
 	int total_len = 0;
-	
+
 	while (t) {
 		if (t != arglist)
 			total_len += 1; /* for the sep */
@@ -755,7 +755,7 @@ static char *compose_func_args(struct expr_node *arglist)
 			else
 				total_len += strlen(t->val->u.s);
 		}
-		
+
 		t = t->right;
 	}
 	total_len++; /* for the null */
@@ -765,10 +765,10 @@ static char *compose_func_args(struct expr_node *arglist)
 	t = arglist;
 	while (t) {
 		char numbuf[30];
-		
+
 		if (t != arglist)
 			strcat(argbuf,",");
-		
+
 		if (t->val) {
 			if (t->val->type == AST_EXPR_number) {
 				sprintf(numbuf,FP___PRINTF,t->val->u.i);
@@ -1048,7 +1048,7 @@ static struct val *op_func(struct val *funcname, struct expr_node *arglist, stru
 				ast_log(LOG_WARNING,"Hey! chan is NULL.\n");
 			if (!f)
 				ast_log(LOG_WARNING,"Hey! could not find func %s.\n", funcname->u.s);
-			
+
 			if (f && chan) {
 				if (f->read) {
 					char workspace[512];
@@ -1063,7 +1063,7 @@ static struct val *op_func(struct val *funcname, struct expr_node *arglist, stru
 					ast_log(LOG_ERROR,"Error! Function '%s' cannot be read!\n", funcname->u.s);
 					return (make_number ((FP___TYPE)0.0));
 				}
-				
+
 			} else {
 				ast_log(LOG_ERROR, "Error! '%s' doesn't appear to be an available function!\n", funcname->u.s);
 				return (make_number ((FP___TYPE)0.0));
@@ -1094,7 +1094,7 @@ op_or (struct val *a, struct val *b)
 		return (a);
 	}
 }
-		
+
 static struct val *
 op_and (struct val *a, struct val *b)
 {
@@ -1111,11 +1111,11 @@ op_and (struct val *a, struct val *b)
 static struct val *
 op_eq (struct val *a, struct val *b)
 {
-	struct val *r; 
+	struct val *r;
 
 	if (isstring (a) || isstring (b)) {
 		to_string (a);
-		to_string (b);	
+		to_string (b);
 		r = make_number ((FP___TYPE)(strcoll (a->u.s, b->u.s) == 0));
 	} else {
 #ifdef DEBUG_FOR_CONVERSIONS
@@ -1390,7 +1390,7 @@ op_compl (struct val *a)
 {
 	int v1 = 1;
 	struct val *r;
-	
+
 	if( !a )
 	{
 		v1 = 0;
@@ -1403,7 +1403,7 @@ op_compl (struct val *a)
 			if( a->u.i == 0 )
 				v1 = 0;
 			break;
-			
+
 		case AST_EXPR_string:
 			if( a->u.s == 0 )
 				v1 = 0;
@@ -1417,7 +1417,7 @@ op_compl (struct val *a)
 					v1 = atoi(a->u.s);
 			}
 			break;
-			
+
 		case AST_EXPR_numeric_string:
 			if( a->u.s == 0 )
 				v1 = 0;
@@ -1433,7 +1433,7 @@ op_compl (struct val *a)
 			break;
 		}
 	}
-	
+
 	r = make_number (!v1);
 	free_value (a);
 	return r;
@@ -1504,7 +1504,7 @@ op_div (struct val *a, struct val *b)
 	}
 
 	if (b->u.i == 0) {
-		ast_log(LOG_WARNING, "division by zero\n");		
+		ast_log(LOG_WARNING, "division by zero\n");
 		free_value(a);
 		free_value(b);
 		return make_number(INT_MAX);
@@ -1518,7 +1518,7 @@ op_div (struct val *a, struct val *b)
 	free_value (b);
 	return r;
 }
-	
+
 static struct val *
 op_rem (struct val *a, struct val *b)
 {
@@ -1544,7 +1544,7 @@ op_rem (struct val *a, struct val *b)
 	free_value (b);
 	return r;
 }
-	
+
 
 static struct val *
 op_colon (struct val *a, struct val *b)
@@ -1567,7 +1567,7 @@ op_colon (struct val *a, struct val *b)
 		ast_log(LOG_WARNING, "regcomp() error : %s\n", errbuf);
 		free_value(a);
 		free_value(b);
-		return make_str("");		
+		return make_str("");
 	}
 
 	/* compare string against pattern */
@@ -1595,7 +1595,7 @@ op_colon (struct val *a, struct val *b)
 
 	return v;
 }
-	
+
 
 static struct val *
 op_eqtilde (struct val *a, struct val *b)
@@ -1618,7 +1618,7 @@ op_eqtilde (struct val *a, struct val *b)
 		ast_log(LOG_WARNING, "regcomp() error : %s\n", errbuf);
 		free_value(a);
 		free_value(b);
-		return make_str("");		
+		return make_str("");
 	}
 
 	/* compare string against pattern */
diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c
index 1f67d460d..f52b92953 100644
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -36,7 +36,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
+ * if you want the limit (max/min) macros for int types.
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -53,7 +53,7 @@ typedef uint32_t flex_uint32_t;
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
+typedef unsigned char flex_uint8_t;
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 
@@ -186,7 +186,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-    
+
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -248,7 +248,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -603,7 +603,7 @@ struct parse_io
 	yyscan_t scanner;
 	struct ast_channel *chan;
 };
- 
+
 void ast_yyset_column(int column_no, yyscan_t yyscanner);
 int ast_yyget_column(yyscan_t yyscanner);
 static int curlycount = 0;
@@ -670,9 +670,9 @@ static int yy_init_globals (yyscan_t yyscanner );
     /* This must go here because YYSTYPE and YYLTYPE are included
      * from bison output in section 1.*/
     #    define yylval yyg->yylval_r
-    
+
     #    define yylloc yyg->yylloc_r
-    
+
 int ast_yylex_init (yyscan_t* scanner);
 
 int ast_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
@@ -711,9 +711,9 @@ YYSTYPE * ast_yyget_lval (yyscan_t yyscanner );
 void ast_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
 
        YYLTYPE *ast_yyget_lloc (yyscan_t yyscanner );
-    
+
         void ast_yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
-    
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -727,7 +727,7 @@ extern int ast_yywrap (yyscan_t yyscanner );
 #endif
 
     static void yyunput (int c,char *buf_ptr  ,yyscan_t yyscanner);
-    
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
 #endif
@@ -1726,7 +1726,7 @@ static void ast_yy_load_buffer_state  (yyscan_t yyscanner)
     YY_BUFFER_STATE ast_yy_create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
 {
 	YY_BUFFER_STATE b;
-    
+
 	b = (YY_BUFFER_STATE) ast_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in ast_yy_create_buffer()" );
@@ -1770,7 +1770,7 @@ static void ast_yy_load_buffer_state  (yyscan_t yyscanner)
 #ifndef __cplusplus
 extern int isatty (int );
 #endif /* __cplusplus */
-    
+
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
  * such as during a ast_yyrestart() or at EOF.
@@ -1796,7 +1796,7 @@ extern int isatty (int );
     }
 
         b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
+
 	errno = oerrno;
 }
 
@@ -1902,9 +1902,9 @@ static void ast_yyensure_buffer_stack (yyscan_t yyscanner)
 								, yyscanner);
 		if ( ! yyg->yy_buffer_stack )
 			YY_FATAL_ERROR( "out of dynamic memory in ast_yyensure_buffer_stack()" );
-								  
+
 		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
+
 		yyg->yy_buffer_stack_max = num_to_alloc;
 		yyg->yy_buffer_stack_top = 0;
 		return;
@@ -1933,12 +1933,12 @@ static void ast_yyensure_buffer_stack (yyscan_t yyscanner)
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
  * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object. 
+ * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE ast_yy_scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
 {
 	YY_BUFFER_STATE b;
-    
+
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -1974,7 +1974,7 @@ YY_BUFFER_STATE ast_yy_scan_buffer  (char * base, yy_size_t  size , yyscan_t yys
  */
 YY_BUFFER_STATE ast_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
 {
-    
+
 	return ast_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner);
 }
 
@@ -1991,7 +1991,7 @@ YY_BUFFER_STATE ast_yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len ,
 	char *buf;
 	yy_size_t n;
 	int i;
-    
+
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
 	buf = (char *) ast_yyalloc(n ,yyscanner );
@@ -2059,10 +2059,10 @@ YY_EXTRA_TYPE ast_yyget_extra  (yyscan_t yyscanner)
 int ast_yyget_lineno  (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
+
         if (! YY_CURRENT_BUFFER)
             return 0;
-    
+
     return yylineno;
 }
 
@@ -2072,10 +2072,10 @@ int ast_yyget_lineno  (yyscan_t yyscanner)
 int ast_yyget_column  (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
+
         if (! YY_CURRENT_BUFFER)
             return 0;
-    
+
     return yycolumn;
 }
 
@@ -2136,8 +2136,8 @@ void ast_yyset_lineno (int  line_number , yyscan_t yyscanner)
 
         /* lineno is only valid if an input buffer exists. */
         if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "ast_yyset_lineno called with no buffer" , yyscanner); 
-    
+           yy_fatal_error( "ast_yyset_lineno called with no buffer" , yyscanner);
+
     yylineno = line_number;
 }
 
@@ -2151,8 +2151,8 @@ void ast_yyset_column (int  column_no , yyscan_t yyscanner)
 
         /* column is only valid if an input buffer exists. */
         if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "ast_yyset_column called with no buffer" , yyscanner); 
-    
+           yy_fatal_error( "ast_yyset_column called with no buffer" , yyscanner);
+
     yycolumn = column_no;
 }
 
@@ -2205,13 +2205,13 @@ YYLTYPE *ast_yyget_lloc  (yyscan_t yyscanner)
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
     return yylloc;
 }
-    
+
 void ast_yyset_lloc (YYLTYPE *  yylloc_param , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
     yylloc = yylloc_param;
 }
-    
+
 /* User-visible API */
 
 /* ast_yylex_init is special because it creates the scanner itself, so it is
@@ -2259,20 +2259,20 @@ int ast_yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals
         errno = EINVAL;
         return 1;
     }
-	
+
     *ptr_yy_globals = (yyscan_t) ast_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
-	
+
     if (*ptr_yy_globals == NULL){
         errno = ENOMEM;
         return 1;
     }
-    
+
     /* By setting to 0xAA, we expose bugs in
     yy_init_globals. Leave at 0x00 for releases. */
     memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-    
+
     ast_yyset_extra (yy_user_defined, *ptr_yy_globals);
-    
+
     return yy_init_globals ( *ptr_yy_globals );
 }
 
@@ -2487,7 +2487,7 @@ void  ast_expr_clear_extra_error_info(void)
        extra_error_message[0] = 0;
 }
 
-static const char * const expr2_token_equivs1[] = 
+static const char * const expr2_token_equivs1[] =
 {
 	"TOKEN",
 	"TOK_COND",
@@ -2513,7 +2513,7 @@ static const char * const expr2_token_equivs1[] =
 	"TOK_LP"
 };
 
-static const char * const expr2_token_equivs2[] = 
+static const char * const expr2_token_equivs2[] =
 {
 	"<token>",
 	"?",
@@ -2624,4 +2624,3 @@ int ast_yyerror (const char *s,  yyltype *loc, struct parse_io *parseio )
 	free(s2);
 	return(0);
 }
-
diff --git a/main/astfd.c b/main/astfd.c
index a96471d60..e9bc142f1 100644
--- a/main/astfd.c
+++ b/main/astfd.c
@@ -306,4 +306,3 @@ int ast_fd_init(void)
 	return 0;
 }
 #endif /* defined(DEBUG_FD_LEAKS) */
-
diff --git a/main/astobj2_container.c b/main/astobj2_container.c
index 466c10372..ae20fa639 100644
--- a/main/astobj2_container.c
+++ b/main/astobj2_container.c
@@ -1236,4 +1236,3 @@ int container_init(void)
 
 	return 0;
 }
-
diff --git a/main/astobj2_hash.c b/main/astobj2_hash.c
index f5c678740..da0ae8dea 100644
--- a/main/astobj2_hash.c
+++ b/main/astobj2_hash.c
@@ -1153,4 +1153,3 @@ struct ao2_container *__ao2_container_alloc_list_debug(unsigned int ao2_options,
 	return __ao2_container_alloc_hash_debug(ao2_options, container_options, 1, NULL,
 		sort_fn, cmp_fn, tag, file, line, func, ref_debug);
 }
-
diff --git a/main/astobj2_rbtree.c b/main/astobj2_rbtree.c
index 4362b83cb..d2c2ebf3f 100644
--- a/main/astobj2_rbtree.c
+++ b/main/astobj2_rbtree.c
@@ -2097,4 +2097,3 @@ struct ao2_container *__ao2_container_alloc_rbtree_debug(unsigned int ao2_option
 		tag, file, line, func, ref_debug);
 	return rb_ao2_container_init(self, container_options, sort_fn, cmp_fn);
 }
-
diff --git a/main/bridge_basic.c b/main/bridge_basic.c
index 93da8cecb..53a4be703 100644
--- a/main/bridge_basic.c
+++ b/main/bridge_basic.c
@@ -3666,4 +3666,3 @@ void ast_bridging_init_basic(void)
 	ast_bridge_features_register(AST_BRIDGE_BUILTIN_ATTENDEDTRANSFER, feature_attended_transfer, NULL);
 	ast_bridge_features_register(AST_BRIDGE_BUILTIN_BLINDTRANSFER, feature_blind_transfer, NULL);
 }
-
diff --git a/main/ccss.c b/main/ccss.c
index 2a939abfd..ca0c17c1f 100644
--- a/main/ccss.c
+++ b/main/ccss.c
@@ -2859,7 +2859,7 @@ static void *generic_recall(void *data)
 		return NULL;
 	}
 	ao2_ref(tmp_cap, -1);
-	
+
 	/* We have a channel. It's time now to set up the datastore of recalled CC interfaces.
 	 * This will be a common task for all recall functions. If it were possible, I'd have
 	 * the core do it automatically, but alas I cannot. Instead, I will provide a public
diff --git a/main/channel.c b/main/channel.c
index d22c98738..48963c729 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -11033,4 +11033,3 @@ void ast_channel_clear_flag(struct ast_channel *chan, unsigned int flag)
 	ast_clear_flag(ast_channel_flags(chan), flag);
 	ast_channel_unlock(chan);
 }
-
diff --git a/main/db.c b/main/db.c
index da533a4ec..bf730207c 100644
--- a/main/db.c
+++ b/main/db.c
@@ -1029,8 +1029,8 @@ static void *db_sync_thread(void *data)
 	ast_mutex_lock(&dblock);
 	ast_db_begin_transaction();
 	for (;;) {
-		/* If dosync is set, db_sync() was called during sleep(1), 
-		 * and the pending transaction should be committed. 
+		/* If dosync is set, db_sync() was called during sleep(1),
+		 * and the pending transaction should be committed.
 		 * Otherwise, block until db_sync() is called.
 		 */
 		while (!dosync) {
diff --git a/main/dns.c b/main/dns.c
index 320d91768..de26c8d7c 100644
--- a/main/dns.c
+++ b/main/dns.c
@@ -340,4 +340,3 @@ struct ao2_container *ast_dns_get_nameservers(void)
 
 	return nameservers;
 }
-
diff --git a/main/editline/INSTALL b/main/editline/INSTALL
index 16fb6ffd1..05e00f71c 100644
--- a/main/editline/INSTALL
+++ b/main/editline/INSTALL
@@ -29,7 +29,7 @@ Optionally, pass any of the following (not a definitive list) arguments to
 
 --prefix=<install-root-dir>
 	Set the base directory in which to install.  For example:
-	
+
 		./configure --prefix=/usr/local
 
 	will cause files to be installed into /usr/local/bin, /usr/local/man,
@@ -51,7 +51,7 @@ CFLAGS="?"
 
 CPPFLAGS="?"
 	Pass these flags to the C preprocessor.  Note that CFLAGS is not passed
-	to 'cpp' when 'configure' is looking for include files, so you must use 
+	to 'cpp' when 'configure' is looking for include files, so you must use
 	CPPFLAGS instead if you need to help 'configure' find header files.
 
 LD_LIBRARY_PATH="?"
diff --git a/main/editline/chared.c b/main/editline/chared.c
index 8eaeb3b54..d0a03e2ad 100644
--- a/main/editline/chared.c
+++ b/main/editline/chared.c
@@ -515,7 +515,7 @@ ch_enlargebufs(el, addlen)
 
 	/* zero the newly added memory, leave old data in */
 	(void) memset(&newbuffer[sz], 0, newsz - sz);
-	    
+
 	oldbuf = el->el_line.buffer;
 
 	el->el_line.buffer = newbuffer;
@@ -554,7 +554,7 @@ ch_enlargebufs(el, addlen)
 	el->el_chared.c_undo.ptr = el->el_line.buffer +
 				    (el->el_chared.c_undo.ptr - oldbuf);
 	el->el_chared.c_undo.buf = newbuffer;
-	
+
 	if (!hist_enlargebuf(el, sz, newsz))
 		return 0;
 
diff --git a/main/editline/configure b/main/editline/configure
index d5d0a4dea..ea180bce2 100755
--- a/main/editline/configure
+++ b/main/editline/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
+# Generated automatically using autoconf version 2.13
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -932,15 +932,15 @@ case "${host}" in
 	if echo ${host} | grep -q cygwin ; then \
 		echo "cygwin detected"; \
 		S_CFLAGS=""; \
-		echo "/* cygdef.h. Generated automatically by configure. */ 
+		echo "/* cygdef.h. Generated automatically by configure. */
 #ifndef _CYGDEF_H_
 #define _CYGDEF_H_ 1
 #include <sys/ioctl.h>
 #define __linux__ 1
- 
+
 
 typedef void (*sig_t)(int);
- 
+
 
 #endif /* _CYGDEF_H_ */" > cygdef.h; \
 	echo "
@@ -1092,13 +1092,13 @@ else
   /*)
   ac_cv_path_AR="$AR" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
+  ?:/*)
   ac_cv_path_AR="$AR" # Let the user override the test with a dos path.
   ;;
   *)
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_AR="$ac_dir/$ac_word"
@@ -1348,7 +1348,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
 \
@@ -1386,7 +1386,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
 \
@@ -1428,7 +1428,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
 \
@@ -1466,7 +1466,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
 \
@@ -1515,7 +1515,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -1571,7 +1571,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -1626,7 +1626,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
 CCSRCS="$CCSRCS np/fgetln.c"
@@ -1682,7 +1682,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
 CCSRCS="$CCSRCS np/vis.c"
@@ -1738,7 +1738,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
 CCSRCS="$CCSRCS np/unvis.c"
@@ -1794,7 +1794,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
 CCSRCS="$CCSRCS np/strlcpy.c"
@@ -1850,7 +1850,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
 CCSRCS="$CCSRCS np/strlcat.c"
@@ -2460,5 +2460,3 @@ EOF
 chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-
diff --git a/main/editline/configure.in b/main/editline/configure.in
index d8bc706b1..bd99b5a86 100644
--- a/main/editline/configure.in
+++ b/main/editline/configure.in
@@ -1,6 +1,6 @@
-dnl 
+dnl
 dnl Process this file with autoconf to produce a configure script.
-dnl 
+dnl
 AC_INIT(Makefile.in)
 
 dnl If CFLAGS isn't defined and using gcc, set CFLAGS to something reasonable.
@@ -36,15 +36,15 @@ case "${host}" in
 	if echo ${host} | grep -q cygwin ; then \
 		echo "cygwin detected"; \
 		S_CFLAGS=""; \
-		echo "/* cygdef.h. Generated automatically by configure. */ 
+		echo "/* cygdef.h. Generated automatically by configure. */
 #ifndef _CYGDEF_H_
 #define _CYGDEF_H_ 1
 #include <sys/ioctl.h>
 #define __linux__ 1
- 
+
 
 typedef void (*sig_t)(int);
- 
+
 
 #endif /* _CYGDEF_H_ */" > cygdef.h; \
 	echo "
@@ -155,10 +155,10 @@ else
 fi
 
 
-dnl 
+dnl
 dnl File lists.  This is done here instead of in the Makefile in order to avoid
 dnl the need for conditionals.
-dnl 
+dnl
 
 dnl .c files.
 ACSRCS="common.c emacs.c vi.c"
@@ -275,4 +275,3 @@ AC_SUBST(TCSRCS)
 
 AC_CONFIG_HEADER(config.h)
 AC_OUTPUT([Makefile makelist])
-
diff --git a/main/editline/install-sh b/main/editline/install-sh
index ebc66913e..058b26c82 100755
--- a/main/editline/install-sh
+++ b/main/editline/install-sh
@@ -115,7 +115,7 @@ fi
 if [ x"$dir_arg" != x ]; then
 	dst=$src
 	src=""
-	
+
 	if [ -d $dst ]; then
 		instcmd=:
 	else
@@ -124,7 +124,7 @@ if [ x"$dir_arg" != x ]; then
 else
 
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
+# might cause directories to be created, which would be especially bad
 # if $src (and thus $dsttmp) contains '*'.
 
 	if [ -f $src -o -d $src ]
@@ -134,7 +134,7 @@ else
 		echo "install:  $src does not exist"
 		exit 1
 	fi
-	
+
 	if [ x"$dst" = x ]
 	then
 		echo "install:	no destination specified"
@@ -162,7 +162,7 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
-defaultIFS='	
+defaultIFS='
 '
 IFS="${IFS-${defaultIFS}}"
 
@@ -201,17 +201,17 @@ else
 
 # If we're going to rename the final executable, determine the name now.
 
-	if [ x"$transformarg" = x ] 
+	if [ x"$transformarg" = x ]
 	then
 		dstfile=`basename $dst`
 	else
-		dstfile=`basename $dst $transformbasename | 
+		dstfile=`basename $dst $transformbasename |
 			sed $transformarg`$transformbasename
 	fi
 
 # don't allow the sed command to completely eliminate the filename
 
-	if [ x"$dstfile" = x ] 
+	if [ x"$dstfile" = x ]
 	then
 		dstfile=`basename $dst`
 	else
@@ -242,7 +242,7 @@ else
 # Now rename the file to the real destination.
 
 	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+	$doit $mvcmd $dsttmp $dstdir/$dstfile
 
 fi &&
 
diff --git a/main/editline/np/unvis.c b/main/editline/np/unvis.c
index 844a5581b..0a26e3d63 100644
--- a/main/editline/np/unvis.c
+++ b/main/editline/np/unvis.c
@@ -105,7 +105,7 @@ __unvis13(cp, c, astate, flag)
 		    || *astate == S_HEX2) {
 			*astate = S_GROUND;
 			return (UNVIS_VALID);
-		} 
+		}
 		return (*astate == S_GROUND ? UNVIS_NOCHAR : UNVIS_SYNBAD);
 	}
 
@@ -116,7 +116,7 @@ __unvis13(cp, c, astate, flag)
 		if (c == '\\') {
 			*astate = S_START;
 			return (0);
-		} 
+		}
 		if ((flag & VIS_HTTPSTYLE) && c == '%') {
 			*astate = S_HEX1;
 			return (0);
@@ -193,7 +193,7 @@ __unvis13(cp, c, astate, flag)
 		}
 		*astate = S_GROUND;
 		return (UNVIS_SYNBAD);
-		 
+
 	case S_META:
 		if (c == '-')
 			*astate = S_META1;
@@ -204,12 +204,12 @@ __unvis13(cp, c, astate, flag)
 			return (UNVIS_SYNBAD);
 		}
 		return (0);
-		 
+
 	case S_META1:
 		*astate = S_GROUND;
 		*cp |= c;
 		return (UNVIS_VALID);
-		 
+
 	case S_CTRL:
 		if (c == '?')
 			*cp |= 0177;
@@ -220,15 +220,15 @@ __unvis13(cp, c, astate, flag)
 
 	case S_OCTAL2:	/* second possible octal digit */
 		if (isoctal(c)) {
-			/* 
-			 * yes - and maybe a third 
+			/*
+			 * yes - and maybe a third
 			 */
 			*cp = (*cp << 3) + (c - '0');
-			*astate = S_OCTAL3;	
+			*astate = S_OCTAL3;
 			return (0);
-		} 
-		/* 
-		 * no - done with current sequence, push back passed char 
+		}
+		/*
+		 * no - done with current sequence, push back passed char
 		 */
 		*astate = S_GROUND;
 		return (UNVIS_VALIDPUSH);
@@ -249,8 +249,8 @@ __unvis13(cp, c, astate, flag)
 			*astate = S_HEX2;
 			return (0);
 		}
-		/* 
-		 * no - done with current sequence, push back passed char 
+		/*
+		 * no - done with current sequence, push back passed char
 		 */
 		*astate = S_GROUND;
 		return (UNVIS_VALIDPUSH);
@@ -261,9 +261,9 @@ __unvis13(cp, c, astate, flag)
 			return (UNVIS_VALID);
 		}
                 return (UNVIS_VALIDPUSH);
-	default:	
-		/* 
-		 * decoder in unknown state - (probably uninitialized) 
+	default:
+		/*
+		 * decoder in unknown state - (probably uninitialized)
 		 */
 		*astate = S_GROUND;
 		return (UNVIS_SYNBAD);
@@ -271,7 +271,7 @@ __unvis13(cp, c, astate, flag)
 }
 
 /*
- * strunvis - decode src into dst 
+ * strunvis - decode src into dst
  *
  *	Number of chars decoded into dst is returned, -1 on error.
  *	Dst is null terminated.
diff --git a/main/editline/np/vis.c b/main/editline/np/vis.c
index bd8192440..264dce629 100644
--- a/main/editline/np/vis.c
+++ b/main/editline/np/vis.c
@@ -111,7 +111,7 @@ do 									      \
 		SVIS(dst, c, flag, nextc, extra);			      \
 	}								      \
 while (/*CONSTCOND*/0)
-	
+
 /*
  * This is SVIS, the central macro of vis.
  * dst:	      Pointer to the destination buffer
@@ -219,10 +219,10 @@ svis(dst, c, flag, nextc, extra)
  *	be encoded, too. These functions are useful e. g. to
  *	encode strings in such a way so that they are not interpreted
  *	by a shell.
- *	
+ *
  *	Dst must be 4 times the size of src to account for possible
  *	expansion.  The length of dst, not including the trailing NULL,
- *	is returned. 
+ *	is returned.
  *
  *	Strsvisx encodes exactly len bytes from src into dst.
  *	This is useful for encoding a block of data.
@@ -294,7 +294,7 @@ char *
 vis(dst, c, flag, nextc)
 	char *dst;
 	int c, flag, nextc;
-	
+
 {
 	char *extra;
 
@@ -312,10 +312,10 @@ vis(dst, c, flag, nextc)
 
 /*
  * strvis, strvisx - visually encode characters from src into dst
- *	
+ *
  *	Dst must be 4 times the size of src to account for possible
  *	expansion.  The length of dst, not including the trailing NULL,
- *	is returned. 
+ *	is returned.
  *
  *	Strvisx encodes exactly len bytes from src into dst.
  *	This is useful for encoding a block of data.
diff --git a/main/editline/read.h b/main/editline/read.h
index b01e77db2..716a51693 100644
--- a/main/editline/read.h
+++ b/main/editline/read.h
@@ -47,7 +47,7 @@ typedef int (*el_rfunc_t)(EditLine *, char *);
 typedef struct el_read_t {
 	el_rfunc_t	read_char;	/* Function to read a character */
 } el_read_t;
- 
+
 protected int		read_init(EditLine *);
 protected int		el_read_setfn(EditLine *, el_rfunc_t);
 protected el_rfunc_t	el_read_getfn(EditLine *);
diff --git a/main/editline/readline.c b/main/editline/readline.c
index 48a843df2..7389c1886 100644
--- a/main/editline/readline.c
+++ b/main/editline/readline.c
@@ -250,7 +250,7 @@ rl_initialize(void)
 			break;
 		}
 	}
-		
+
 	/* read settings from configuration file */
 	el_source(e, NULL);
 
@@ -1531,7 +1531,7 @@ rl_complete_internal(int what_to_do)
 					maxlen = match_len;
 			}
 			matches_num = i - 1;
-				
+
 			/* newline to get on next line from command line */
 			fprintf(e->el_outfile, "\n");
 
diff --git a/main/editline/refresh.c b/main/editline/refresh.c
index 1acc261a7..fe3ac440f 100644
--- a/main/editline/refresh.c
+++ b/main/editline/refresh.c
@@ -166,7 +166,7 @@ re_putc(EditLine *el, int c, int shift)
 			for(i=1; i < lins; i++)
 				el->el_vdisplay[i-1] = el->el_vdisplay[i];
 
-			firstline[0] = '\0';		/* empty the string */	
+			firstline[0] = '\0';		/* empty the string */
 			el->el_vdisplay[i-1] = firstline;
 		} else
 			el->el_refresh.r_cursor.v++;
@@ -1002,7 +1002,7 @@ re_fastputc(EditLine *el, int c)
 		if (el->el_cursor.v + 1 >= el->el_term.t_size.v) {
 			int i, lins = el->el_term.t_size.v;
 			char *firstline = el->el_display[0];
-	
+
 			for(i=1; i < lins; i++)
 				el->el_display[i-1] = el->el_display[i];
 
diff --git a/main/editline/term.c b/main/editline/term.c
index 00b68ed33..03623be21 100644
--- a/main/editline/term.c
+++ b/main/editline/term.c
@@ -640,7 +640,7 @@ mc_again:
 						    (el->el_cursor.h & 0370);
 						    i < (where & 0370);
 						    i += 8)
-							term__putc('\t');	
+							term__putc('\t');
 							/* then tab over */
 						el->el_cursor.h = where & 0370;
 					}
diff --git a/main/format_cache.c b/main/format_cache.c
index 00563e899..3de1951a3 100644
--- a/main/format_cache.c
+++ b/main/format_cache.c
@@ -541,4 +541,3 @@ int ast_format_cache_is_slinear(struct ast_format *format)
 
 	return 0;
 }
-
diff --git a/main/format_compatibility.c b/main/format_compatibility.c
index 0f1dff7c8..6a4dacbb1 100644
--- a/main/format_compatibility.c
+++ b/main/format_compatibility.c
@@ -271,4 +271,3 @@ struct ast_format *ast_format_compatibility_bitfield2format(uint64_t bitfield)
 	}
 	return NULL;
 }
-
diff --git a/main/fskmodem.c b/main/fskmodem.c
index dee5f5cf7..63f7ce8e1 100644
--- a/main/fskmodem.c
+++ b/main/fskmodem.c
@@ -32,4 +32,3 @@
 #else
 #include "fskmodem_float.c"
 #endif
-
diff --git a/main/indications.c b/main/indications.c
index 02a68b7ca..488868076 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -1194,4 +1194,3 @@ int ast_indications_reload(void)
 {
 	return load_indications(1);
 }
-
diff --git a/main/manager_channels.c b/main/manager_channels.c
index ffcd7f7e5..71c17322a 100644
--- a/main/manager_channels.c
+++ b/main/manager_channels.c
@@ -1300,4 +1300,3 @@ int manager_channels_init(void)
 
 	return 0;
 }
-
diff --git a/main/manager_endpoints.c b/main/manager_endpoints.c
index b2a45734a..4d997e622 100644
--- a/main/manager_endpoints.c
+++ b/main/manager_endpoints.c
@@ -87,4 +87,3 @@ int manager_endpoints_init(void)
 
 	return 0;
 }
-
diff --git a/main/media_index.c b/main/media_index.c
index 60bdfe3fd..72bc1ccbe 100644
--- a/main/media_index.c
+++ b/main/media_index.c
@@ -589,4 +589,3 @@ int ast_media_index_update(struct ast_media_index *index,
 {
 	return media_index_update(index, variant, NULL);
 }
-
diff --git a/main/pbx.c b/main/pbx.c
index cfc5f7f9f..173b62e99 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -5256,8 +5256,8 @@ static char *handle_show_hint(struct ast_cli_entry *e, int cmd, struct ast_cli_a
 			ast_cli(a->fd, "%-20.20s: %-20.20s  State:%-15.15s Presence:%-15.15s Watchers %2d\n",
 				buf,
 				ast_get_extension_app(hint->exten),
-				ast_extension_state2str(hint->laststate), 
-				ast_presence_state2str(hint->last_presence_state), 
+				ast_extension_state2str(hint->laststate),
+				ast_presence_state2str(hint->last_presence_state),
 				watchers);
 			num++;
 		}
diff --git a/main/plc.c b/main/plc.c
index 4421e7a0c..ade8161ea 100644
--- a/main/plc.c
+++ b/main/plc.c
@@ -138,7 +138,7 @@ int plc_rx(plc_state_t *s, int16_t amp[], int len)
 	float old_weight;
 	float new_weight;
 	float gain;
-	
+
 	if (s->missing_samples) {
 		/* Although we have a real signal, we need to smooth it to fit well
 		with the synthetic signal we used for the previous block */
diff --git a/main/poll.c b/main/poll.c
index e0f695504..166e570b4 100644
--- a/main/poll.c
+++ b/main/poll.c
@@ -303,5 +303,3 @@ int ast_poll2(struct pollfd *pArray, unsigned long n_fds, struct timeval *tv)
 	return ready_descriptors;
 #endif
 }
-
-
diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index 67349cefa..6bedd1767 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -2236,7 +2236,7 @@ static void set_next_mime_type(struct ast_format *format, int rtp_code, const ch
 	}
 
 	/* Make sure any previous value in ast_rtp_mime_types is cleaned up */
-	memset(&ast_rtp_mime_types[x], 0, sizeof(struct ast_rtp_mime_type));	
+	memset(&ast_rtp_mime_types[x], 0, sizeof(struct ast_rtp_mime_type));
 	if (format) {
 		ast_rtp_mime_types[x].payload_type.asterisk_format = 1;
 		ast_rtp_mime_types[x].payload_type.format = ao2_bump(format);
diff --git a/main/sdp_srtp.c b/main/sdp_srtp.c
index 3d1d85039..4116f20cc 100644
--- a/main/sdp_srtp.c
+++ b/main/sdp_srtp.c
@@ -438,4 +438,3 @@ char *ast_sdp_get_rtp_profile(unsigned int sdes_active, struct ast_rtp_instance
 		}
 	}
 }
-
diff --git a/main/security_events.c b/main/security_events.c
index 24b2b6a0b..392b2b459 100644
--- a/main/security_events.c
+++ b/main/security_events.c
@@ -1196,5 +1196,3 @@ int ast_security_event_report(const struct ast_security_event_common *sec)
 
 	return 0;
 }
-
-
diff --git a/main/smoother.c b/main/smoother.c
index 720ad8549..36fa74373 100644
--- a/main/smoother.c
+++ b/main/smoother.c
@@ -224,4 +224,3 @@ void ast_smoother_free(struct ast_smoother *s)
 	ao2_cleanup(s->format);
 	ast_free(s);
 }
-
diff --git a/main/stasis.c b/main/stasis.c
index d9785ce73..5f080d1a3 100644
--- a/main/stasis.c
+++ b/main/stasis.c
@@ -1651,4 +1651,3 @@ int stasis_init(void)
 
 	return 0;
 }
-
diff --git a/main/stasis_cache.c b/main/stasis_cache.c
index b0973b984..f5037a42e 100644
--- a/main/stasis_cache.c
+++ b/main/stasis_cache.c
@@ -930,4 +930,3 @@ int stasis_cache_init(void)
 
 	return 0;
 }
-
diff --git a/main/stasis_cache_pattern.c b/main/stasis_cache_pattern.c
index 7ccf1c181..3106cb33e 100644
--- a/main/stasis_cache_pattern.c
+++ b/main/stasis_cache_pattern.c
@@ -212,4 +212,3 @@ struct stasis_topic *stasis_cp_single_topic_cached(
 	}
 	return stasis_caching_get_topic(one->topic_cached);
 }
-
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 1b9345449..f8050c95c 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -2553,4 +2553,3 @@ char *ast_strptime(const char *s, const char *format, struct ast_tm *tm)
 {
 	return ast_strptime_locale(s, format, tm, NULL);
 }
-
diff --git a/main/tdd.c b/main/tdd.c
index a590e3b2f..4f4d75061 100644
--- a/main/tdd.c
+++ b/main/tdd.c
@@ -362,4 +362,3 @@ int tdd_generate(struct tdd_state *tdd, unsigned char *buf, const char *str)
 	}
 	return bytes;
 }
-
diff --git a/main/threadpool.c b/main/threadpool.c
index 874b2d812..e3d0e40fd 100644
--- a/main/threadpool.c
+++ b/main/threadpool.c
@@ -1093,7 +1093,7 @@ static void worker_active(struct worker_thread *worker)
 {
 	int alive;
 
-	/* The following is equivalent to 
+	/* The following is equivalent to
 	 *
 	 * while (threadpool_execute(worker->pool));
 	 *
diff --git a/main/threadstorage.c b/main/threadstorage.c
index 4c46a0f58..c97dca921 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -167,7 +167,7 @@ static char *handle_cli_threadstorage_show_allocations(struct ast_cli_entry *e,
 	pthread_mutex_unlock(&threadstoragelock);
 
 	ast_cli(a->fd, "%10d bytes allocated in %d allocation%s\n", (int) len, count, count > 1 ? "s" : "");
-	
+
 	return CLI_SUCCESS;
 }
 
@@ -226,7 +226,7 @@ static char *handle_cli_threadstorage_show_summary(struct ast_cli_entry *e, int
 	}
 
 	pthread_mutex_unlock(&threadstoragelock);
-	
+
 	AST_LIST_TRAVERSE(&file_summary, file, entry) {
 		len += file->len;
 		count += file->count;
@@ -262,4 +262,3 @@ void threadstorage_init(void)
 }
 
 #endif /* !defined(DEBUG_THREADLOCALS) */
-
diff --git a/main/ulaw.c b/main/ulaw.c
index 76e4b0419..a067845cc 100644
--- a/main/ulaw.c
+++ b/main/ulaw.c
@@ -248,4 +248,3 @@ void ast_ulaw_init(void)
 	ast_log(LOG_NOTICE, "u-Law tandem transcoding test complete.\n");
 #endif /* TEST_TANDEM_TRANSCODING */
 }
-
diff --git a/main/xml.c b/main/xml.c
index bd82b5cbf..46fe198e4 100644
--- a/main/xml.c
+++ b/main/xml.c
@@ -386,4 +386,3 @@ struct ast_xml_xpath_results *ast_xml_query(struct ast_xml_doc *doc, const char
 }
 
 #endif /* defined(HAVE_LIBXML2) */
-
diff --git a/main/xmldoc.c b/main/xmldoc.c
index 5addb23b4..86ccec020 100644
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -2950,5 +2950,3 @@ int ast_xmldoc_load_documentation(void)
 }
 
 #endif /* AST_XML_DOCS */
-
-