automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43931 f38db490-d61c-443f-a65b-d21fe96a405b

4 files changed, 8 insertions, 11 deletions

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 111a2e121..7ac458ca0 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -1630,7 +1630,7 @@ static int misdn_call(struct ast_channel *ast, char *dest, int timeout)
 	
 	{
 		struct chan_list *ch=MISDN_ASTERISK_TECH_PVT(ast);
-		if (!ch) { ast_verbose("No chan_list in misdn_call"); return -1;}
+		if (!ch) { ast_verbose("No chan_list in misdn_call\n"); return -1;}
 		
 		newbc->capability=ast->transfercapability;
 		pbx_builtin_setvar_helper(ast,"TRANSFERCAPABILITY",ast_transfercapability2str(newbc->capability));
@@ -2751,7 +2751,7 @@ static struct ast_frame *process_ast_dsp(struct chan_list *tmp, struct ast_frame
 	
 	f = ast_dsp_process(tmp->ast, tmp->dsp, f2);
 	if (f && (f->frametype == AST_FRAME_DTMF)) {
-		ast_log(LOG_DEBUG, "Detected inband DTMF digit: %c", f->subclass);
+		ast_log(LOG_DEBUG, "Detected inband DTMF digit: %c\n", f->subclass);
 		if (f->subclass == 'f' && tmp->faxdetect) {
 			/* Fax tone -- Handle and return NULL */
 			struct ast_channel *ast = tmp->ast;
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c1aef6a41..db02bb60b 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1170,7 +1170,7 @@ static int append_history(struct sip_pvt *p, const char *event, const char *data
 	if (!recordhistory || !p)
 		return 0;
 	if(!(hist = malloc(sizeof(struct sip_history)))) {
-		ast_log(LOG_WARNING, "Can't allocate memory for history");
+		ast_log(LOG_WARNING, "Can't allocate memory for history\n");
 		return 0;
 	}
 	memset(hist, 0, sizeof(struct sip_history));
@@ -11443,10 +11443,7 @@ static int sipsock_read(int *id, int fd, short events, void *ignore)
 	parse_request(&req);
 	req.method = find_sip_method(req.rlPart1);
 	if (ast_test_flag(&req, SIP_PKT_DEBUG)) {
-		ast_verbose("--- (%d headers %d lines)", req.headers, req.lines);
-		if (req.headers + req.lines == 0) 
-			ast_verbose(" Nat keepalive ");
-		ast_verbose("---\n");
+		ast_verbose("--- (%d headers %d lines)%s ---\n", req.headers, req.lines, (req.headers + req.lines == 0) ? " Nat keepalive" : "");
 	}
 
 	if (req.headers < 2) {
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 54524ce4e..c5f148726 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -1609,7 +1609,7 @@ static struct skinny_device *build_device(char *cat, struct ast_variable *v)
                        					l->sub = sub;
                        				} else {
                        					/* XXX Should find a way to clean up our memory */
-                       					ast_log(LOG_WARNING, "Out of memory allocating subchannel");
+                       					ast_log(LOG_WARNING, "Out of memory allocating subchannel\n");
                       					return NULL;
                        				}
                     			}
@@ -1617,7 +1617,7 @@ static struct skinny_device *build_device(char *cat, struct ast_variable *v)
 					d->lines = l;			
 	    			} else {
 			        	/* XXX Should find a way to clean up our memory */
-                    			ast_log(LOG_WARNING, "Out of memory allocating line");
+                    			ast_log(LOG_WARNING, "Out of memory allocating line\n");
                     			return NULL;
 				}
 			} else {
@@ -3178,7 +3178,7 @@ static int reload_config(void)
 	if (skinnysock < 0) {
 		skinnysock = socket(AF_INET, SOCK_STREAM, 0);
 		if(setsockopt(skinnysock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
-			ast_log(LOG_ERROR, "Set Socket Options failed: errno %d, %s", errno, strerror(errno));
+			ast_log(LOG_ERROR, "Set Socket Options failed: errno %d, %s\n", errno, strerror(errno));
 			ast_config_destroy(cfg);
 			return 0;
 		}
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index c1b6f4b3d..b7ef989d3 100644
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -279,7 +279,7 @@ static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg,
 		if (!src) {
 			src = iax_template_find(def, 0);
 			if (!src)
-				ast_log(LOG_WARNING, "Unable to locate default base template '%s' for creating '%s', omitting.", def, s);
+				ast_log(LOG_WARNING, "Unable to locate default base template '%s' for creating '%s', omitting.\n", def, s);
 		}
 		if (!src)
 			return -1;