From: Kinsey Moore <kmoore@digium.com>
Date: Fri, 6 Apr 2012 18:13:04 +0000 (+0000)
Subject: Add missing newlines to CLI logging
X-Git-Tag: 10.5.0-rc1~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=455c5c8c66a547fff87b6c4578491844eb881fea;p=thirdparty%2Fasterisk.git

Add missing newlines to CLI logging
........

Merged revisions 361471 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@361472 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c
index 6c7e216a34..ee560a6058 100644
--- a/addons/chan_mobile.c
+++ b/addons/chan_mobile.c
@@ -1719,7 +1719,7 @@ static int rfcomm_read_result(int rsock, char **buf, size_t count, size_t *in_co
 	return 1;
 
 e_return:
-	ast_log(LOG_ERROR, "error parsing AT result on rfcomm socket");
+	ast_log(LOG_ERROR, "error parsing AT result on rfcomm socket\n");
 	return res;
 }
 
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 870c423689..95ff8a40d8 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -1081,7 +1081,7 @@ static int chanspy_exec(struct ast_channel *chan, const char *data)
 			if (strchr("0123456789*#", tmp) && tmp != '\0') {
 				user_options.exit = tmp;
 			} else {
-				ast_log(LOG_NOTICE, "Argument for option 'x' must be a valid DTMF digit.");
+				ast_log(LOG_NOTICE, "Argument for option 'x' must be a valid DTMF digit.\n");
 			}
 		}
 
@@ -1090,7 +1090,7 @@ static int chanspy_exec(struct ast_channel *chan, const char *data)
 			if (strchr("0123456789*#", tmp) && tmp != '\0') {
 				user_options.cycle = tmp;
 			} else {
-				ast_log(LOG_NOTICE, "Argument for option 'c' must be a valid DTMF digit.");
+				ast_log(LOG_NOTICE, "Argument for option 'c' must be a valid DTMF digit.\n");
 			}
 		}
 
@@ -1207,7 +1207,7 @@ static int extenspy_exec(struct ast_channel *chan, const char *data)
 			if (strchr("0123456789*#", tmp) && tmp != '\0') {
 				user_options.exit = tmp;
 			} else {
-				ast_log(LOG_NOTICE, "Argument for option 'x' must be a valid DTMF digit.");
+				ast_log(LOG_NOTICE, "Argument for option 'x' must be a valid DTMF digit.\n");
 			}
 		}
 
@@ -1216,7 +1216,7 @@ static int extenspy_exec(struct ast_channel *chan, const char *data)
 			if (strchr("0123456789*#", tmp) && tmp != '\0') {
 				user_options.cycle = tmp;
 			} else {
-				ast_log(LOG_NOTICE, "Argument for option 'c' must be a valid DTMF digit.");
+				ast_log(LOG_NOTICE, "Argument for option 'c' must be a valid DTMF digit.\n");
 			}
 		}
 
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 52c03ae09e..f296c493f2 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -97,7 +97,7 @@ static int icesencode(char *filename, int fd)
 	execl(path_BIN "ices2", "ices", filename, SENTINEL);
 	execlp("ices2", "ices", filename, SENTINEL);
 
-	ast_debug(1, "Couldn't find ices version 2, attempting to use ices version 1.");
+	ast_debug(1, "Couldn't find ices version 2, attempting to use ices version 1.\n");
 
 	execl(path_LOCAL "ices", "ices", filename, SENTINEL);
 	execl(path_BIN "ices", "ices", filename, SENTINEL);
diff --git a/apps/app_sms.c b/apps/app_sms.c
index e3f8c5260b..d216932a6a 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -1373,7 +1373,7 @@ static void sms_messagerx2(sms_t * h)
 			h->hangup = 1;                  /* hangup */
 		} else {
 			/* XXX depending on what we are.. */
-			ast_log(LOG_NOTICE, "SMS_SUBMIT or SMS_DELIVERY");
+			ast_log(LOG_NOTICE, "SMS_SUBMIT or SMS_DELIVERY\n");
 			sms_nextoutgoing (h);
 		}
 		break;
@@ -1801,7 +1801,7 @@ static void sms_process(sms_t * h, int samples, signed short *data)
 				h->iphasep -= 80;
 				if (h->ibitn++ == 9) {      /* end of byte */
 					if (!bit) {             /* bad stop bit */
-						ast_log(LOG_NOTICE, "bad stop bit");
+						ast_log(LOG_NOTICE, "bad stop bit\n");
 						h->ierr = 0xFF;     /* unknown error */
 					} else {
 						if (h->ibytep < sizeof(h->imsg)) {
@@ -1809,14 +1809,14 @@ static void sms_process(sms_t * h, int samples, signed short *data)
 							h->ibytec += h->ibytev;
 							h->ibytep++;
 						} else if (h->ibytep == sizeof(h->imsg)) {
-							ast_log(LOG_NOTICE, "msg too large");
+							ast_log(LOG_NOTICE, "msg too large\n");
 							h->ierr = 2;    /* bad message length */
 						}
 						if (h->ibytep > 1 && h->ibytep == 3 + h->imsg[1] && !h->ierr) {
 							if (!h->ibytec) {
 								sms_messagerx(h);
 							} else {
-								ast_log(LOG_NOTICE, "bad checksum");
+								ast_log(LOG_NOTICE, "bad checksum\n");
 								h->ierr = 1; /* bad checksum */
 							}
 						}
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index c34c3c3a7d..461d7c5e44 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -12530,7 +12530,7 @@ static int vmsayname_exec(struct ast_channel *chan, const char *data)
 	int res;
 
 	if (ast_strlen_zero(data)) {
-		ast_log(LOG_WARNING, "VMSayName requires argument mailbox@context");
+		ast_log(LOG_WARNING, "VMSayName requires argument mailbox@context\n");
 		return -1;
 	}
 
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index b762094a96..523714dc5b 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -304,7 +304,7 @@ static int add_codec_to_answer(const struct gtalk_pvt *p, struct ast_format *cod
 		if(!payload_eg711u || !payload_pcmu) {
 			iks_delete(payload_pcmu);
 			iks_delete(payload_eg711u);
-			ast_log(LOG_WARNING,"Failed to allocate iks node");
+			ast_log(LOG_WARNING,"Failed to allocate iks node\n");
 			return -1;
 		}
 		iks_insert_attrib(payload_pcmu, "id", "0");
@@ -326,7 +326,7 @@ static int add_codec_to_answer(const struct gtalk_pvt *p, struct ast_format *cod
 		if(!payload_eg711a || !payload_pcma) {
 			iks_delete(payload_eg711a);
 			iks_delete(payload_pcma);
-			ast_log(LOG_WARNING,"Failed to allocate iks node");
+			ast_log(LOG_WARNING,"Failed to allocate iks node\n");
 			return -1;
 		}
 		iks_insert_attrib(payload_pcma, "id", "8");
@@ -345,7 +345,7 @@ static int add_codec_to_answer(const struct gtalk_pvt *p, struct ast_format *cod
 	if (!strcasecmp("ilbc", format)) {
 		iks *payload_ilbc = iks_new("payload-type");
 		if(!payload_ilbc) {
-			ast_log(LOG_WARNING,"Failed to allocate iks node");
+			ast_log(LOG_WARNING,"Failed to allocate iks node\n");
 			return -1;
 		}
 		iks_insert_attrib(payload_ilbc, "id", "97");
@@ -358,7 +358,7 @@ static int add_codec_to_answer(const struct gtalk_pvt *p, struct ast_format *cod
 	if (!strcasecmp("g723", format)) {
 		iks *payload_g723 = iks_new("payload-type");
 		if(!payload_g723) {
-			ast_log(LOG_WARNING,"Failed to allocate iks node");
+			ast_log(LOG_WARNING,"Failed to allocate iks node\n");
 			return -1;
 		}
 		iks_insert_attrib(payload_g723, "id", "4");
@@ -371,7 +371,7 @@ static int add_codec_to_answer(const struct gtalk_pvt *p, struct ast_format *cod
 	if (!strcasecmp("speex", format)) {
 		iks *payload_speex = iks_new("payload-type");
 		if(!payload_speex) {
-			ast_log(LOG_WARNING,"Failed to allocate iks node");
+			ast_log(LOG_WARNING,"Failed to allocate iks node\n");
 			return -1;
 		}
 		iks_insert_attrib(payload_speex, "id", "110");
@@ -384,7 +384,7 @@ static int add_codec_to_answer(const struct gtalk_pvt *p, struct ast_format *cod
 	if (!strcasecmp("gsm", format)) {
 		iks *payload_gsm = iks_new("payload-type");
 		if(!payload_gsm) {
-			ast_log(LOG_WARNING,"Failed to allocate iks node");
+			ast_log(LOG_WARNING,"Failed to allocate iks node\n");
 			return -1;
 		}
 		iks_insert_attrib(payload_gsm, "id", "103");
@@ -908,7 +908,7 @@ static int gtalk_create_candidates(struct gtalk *client, struct gtalk_pvt *p, ch
 	gtalk_get_local_ip(&us);
 
 	if (!strcmp(ast_sockaddr_stringify_addr(&us), "127.0.0.1")) {
-		ast_log(LOG_WARNING, "Found a loopback IP on the system, check your network configuration or set the bindaddr attribute.");
+		ast_log(LOG_WARNING, "Found a loopback IP on the system, check your network configuration or set the bindaddr attribute.\n");
 	}
 
 	/* Setup our gtalk candidates */
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index eee69ccfbc..96ae9fd724 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5517,7 +5517,7 @@ static int iax2_start_transfer(unsigned short callno0, unsigned short callno1, i
 	unsigned int transferid = (unsigned int)ast_random();
 
 	if (IAX_CALLENCRYPTED(iaxs[callno0]) || IAX_CALLENCRYPTED(iaxs[callno1])) {
-		ast_debug(1, "transfers are not supported for encrypted calls at this time");
+		ast_debug(1, "transfers are not supported for encrypted calls at this time\n");
 		ast_set_flag64(iaxs[callno0], IAX_NOTRANSFER);
 		ast_set_flag64(iaxs[callno1], IAX_NOTRANSFER);
 		return 0;
@@ -7983,7 +7983,7 @@ static int authenticate_verify(struct chan_iax2_pvt *p, struct iax_ies *ies)
 		user = user_unref(user);
 	}
 	if (ast_test_flag64(p, IAX_FORCE_ENCRYPT) && !p->encmethods) { 
-		ast_log(LOG_NOTICE, "Call Terminated, Incoming call is unencrypted while force encrypt is enabled.");
+		ast_log(LOG_NOTICE, "Call Terminated, Incoming call is unencrypted while force encrypt is enabled.\n");
 		return res;
 	}
 	if (!ast_test_flag(&p->state, IAX_STATE_AUTHENTICATED))
@@ -8331,7 +8331,7 @@ static int authenticate_reply(struct chan_iax2_pvt *p, struct sockaddr_in *sin,
 	if (ies->encmethods) {
 		ast_set_flag64(p, IAX_ENCRYPTED | IAX_KEYPOPULATED);
 	} else if (ast_test_flag64(iaxs[callno], IAX_FORCE_ENCRYPT)) {
-		ast_log(LOG_NOTICE, "Call initiated without encryption while forceencryption=yes option is set");
+		ast_log(LOG_NOTICE, "Call initiated without encryption while forceencryption=yes option is set\n");
 		return -1;             /* if force encryption is yes, and no encryption methods, then return -1 to hangup */
 	}
 	if (!res) {
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 9df36eb7a9..07fb89a034 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -1306,7 +1306,7 @@ static int mgcp_senddigit_begin(struct ast_channel *ast, char digit)
 		ast_debug(1, "Sending DTMF using inband/hybrid\n");
 		res = -1; /* Let asterisk play inband indications */
 	} else if (p->dtmfmode & MGCP_DTMF_RFC2833) {
-		ast_debug(1, "Sending DTMF using RFC2833");
+		ast_debug(1, "Sending DTMF using RFC2833\n");
 		ast_rtp_instance_dtmf_begin(sub->rtp, digit);
 	} else {
 		ast_log(LOG_ERROR, "Don't know about DTMF_MODE %d\n", p->dtmfmode);
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index dfb89d5dd2..6952b8d8e7 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2783,7 +2783,7 @@ static void *_sip_tcp_helper_thread(struct ast_tcptls_session_instance *tcptls_s
 			case TCPTLS_ALERT_DATA:
 				ao2_lock(me);
 				if (!(packet = AST_LIST_REMOVE_HEAD(&me->packet_q, entry))) {
-					ast_log(LOG_WARNING, "TCPTLS thread alert_pipe indicated packet should be sent, but frame_q is empty");
+					ast_log(LOG_WARNING, "TCPTLS thread alert_pipe indicated packet should be sent, but frame_q is empty\n");
 				}
 				ao2_unlock(me);
 
@@ -5614,7 +5614,7 @@ static int sip_call(struct ast_channel *ast, char *dest, int timeout)
 			p->options->replaces = ast_var_value(current);
 		} else if (!strcasecmp(ast_var_name(current), "SIP_MAX_FORWARDS")) {
 			if (sscanf(ast_var_value(current), "%30d", &(p->maxforwards)) != 1) {
-				ast_log(LOG_WARNING, "The SIP_MAX_FORWARDS channel variable is not a valid integer.");
+				ast_log(LOG_WARNING, "The SIP_MAX_FORWARDS channel variable is not a valid integer.\n");
 			}
 		}
 	}
@@ -6277,7 +6277,7 @@ static int sip_hangup(struct ast_channel *ast)
 		return 0;
 	}
 	if (ast_test_flag(ast, AST_FLAG_ANSWERED_ELSEWHERE) || ast->hangupcause == AST_CAUSE_ANSWERED_ELSEWHERE) {
-		ast_debug(1, "This call was answered elsewhere");
+		ast_debug(1, "This call was answered elsewhere\n");
 		if (ast->hangupcause == AST_CAUSE_ANSWERED_ELSEWHERE) {
 			ast_debug(1, "####### It's the cause code, buddy. The cause code!!!\n");
 		}
@@ -13303,7 +13303,7 @@ static int manager_sipnotify(struct mansession *s, const struct message *m)
 				ast_str_append(&p->notify->content, 0, "\r\n");
 			ast_str_append(&p->notify->content, 0, "%s", var->value);
 		} else if (!strcasecmp(var->name, "Content-Length")) {
-			ast_log(LOG_WARNING, "it is not necessary to specify Content-Length, ignoring");
+			ast_log(LOG_WARNING, "it is not necessary to specify Content-Length, ignoring\n");
 		} else {
 			header->next = ast_variable_new(var->name, var->value, "");
 			header = header->next;
@@ -19655,7 +19655,7 @@ static char *sip_cli_notify(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
 					ast_str_append(&p->notify->content, 0, "\r\n");
 				ast_str_append(&p->notify->content, 0, "%s", buf);
 			} else if (!strcasecmp(var->name, "Content-Length")) {
-				ast_log(LOG_WARNING, "it is not necessary to specify Content-Length in sip_notify.conf, ignoring");
+				ast_log(LOG_WARNING, "it is not necessary to specify Content-Length in sip_notify.conf, ignoring\n");
 			} else {
 				header->next = ast_variable_new(var->name, buf, "");
 				header = header->next;
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 9a8c064c28..b748b2b857 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -1558,14 +1558,13 @@ static void rcv_mac_addr(struct unistimsession *pte, const unsigned char *buf)
 	int tmp, i = 0;
 	char addrmac[19];
 	int res = 0;
-	if (unistimdebug)
-		ast_verb(0, "Mac Address received : ");
 	for (tmp = 15; tmp < 15 + SIZE_HEADER; tmp++) {
 		sprintf(&addrmac[i], "%.2x", (unsigned char) buf[tmp]);
 		i += 2;
 	}
-	if (unistimdebug)
-		ast_verb(0, "%s\n", addrmac);
+	if (unistimdebug) {
+		ast_verb(0, "Mac Address received : %s\n", addrmac);
+	}
 	strcpy(pte->macaddr, addrmac);
 	res = unistim_register(pte);
 	if (!res) {
@@ -5201,7 +5200,7 @@ static struct unistim_device *build_device(const char *cat, const struct ast_var
 		else if (!strcasecmp(v->name, "contrast")) {
 			d->contrast = atoi(v->value);
 			if ((d->contrast < 0) || (d->contrast > 15)) {
-				ast_log(LOG_WARNING, "constrast must be beetween 0 and 15");
+				ast_log(LOG_WARNING, "contrast must be beetween 0 and 15\n");
 				d->contrast = 8;
 			}
 		} else if (!strcasecmp(v->name, "nat"))
diff --git a/channels/console_gui.c b/channels/console_gui.c
index 375a4019c4..f49152a732 100644
--- a/channels/console_gui.c
+++ b/channels/console_gui.c
@@ -976,7 +976,7 @@ static void eventhandler(struct video_desc *env, const char *caption)
 			case SDL_ACTIVEEVENT:
 #if 0 /* do not react, we don't want to die because the window is minimized */
 				if (ev[i].active.gain == 0 && ev[i].active.state & SDL_APPACTIVE) {
-					ast_log(LOG_WARNING, "/* somebody has killed us ? */");
+					ast_log(LOG_WARNING, "/* somebody has killed us ? */\n");
 					ast_cli_command(gui->outfd, "stop now");
 				}
 #endif
@@ -1635,7 +1635,7 @@ static int keypad_cfg_read(struct gui_info *gui, const char *val)
 	if (gui->kp_size == 0) {
 		gui->kp = ast_calloc(10, sizeof(e));
 		if (gui->kp == NULL) {
-			ast_log(LOG_WARNING, "cannot allocate kp");
+			ast_log(LOG_WARNING, "cannot allocate kp\n");
 			return 0;
 		}
 		gui->kp_size = 10;
@@ -1643,7 +1643,7 @@ static int keypad_cfg_read(struct gui_info *gui, const char *val)
 	if (gui->kp_size == gui->kp_used) { /* must allocate */
 		struct keypad_entry *a = ast_realloc(gui->kp, sizeof(e)*(gui->kp_size+10));
 		if (a == NULL) {
-			ast_log(LOG_WARNING, "cannot reallocate kp");
+			ast_log(LOG_WARNING, "cannot reallocate kp\n");
 			return 0;
 		}
 		gui->kp = a;
diff --git a/channels/console_video.c b/channels/console_video.c
index c26ac983fe..ba12f83c99 100644
--- a/channels/console_video.c
+++ b/channels/console_video.c
@@ -657,7 +657,7 @@ static void my_scale(struct fbuf_t *in, AVPicture *p_in,
 			eff_w, eff_h, out->pix_fmt,
 			SWS_BICUBIC, NULL, NULL, NULL);
 		if (convert_ctx == NULL) {
-			ast_log(LOG_ERROR, "FFMPEG::convert_cmodel : swscale context initialization failed");
+			ast_log(LOG_ERROR, "FFMPEG::convert_cmodel : swscale context initialization failed\n");
 			return;
 		}
 		if (0)
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index bbd053e985..b83ff251b0 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -305,7 +305,7 @@ static struct ast_frame *ogg_vorbis_read(struct ast_filestream *fs,
 	long bytes_read;
 
 	if (desc->writing) {
-		ast_log(LOG_WARNING, "Reading is not suport on OGG/Vorbis on write files.");
+		ast_log(LOG_WARNING, "Reading is not suport on OGG/Vorbis on write files.\n");
 		return NULL;
 	}
 
diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index 0f27a3be8c..da015d5d7c 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -464,7 +464,7 @@ static int func_channel_write_real(struct ast_channel *chan, const char *functio
 			ret = ast_channel_trace_disable(chan);
 		else {
 			ret = -1;
-			ast_log(LOG_WARNING, "Invalid value for CHANNEL(trace).");
+			ast_log(LOG_WARNING, "Invalid value for CHANNEL(trace).\n");
 		}
 		ast_channel_unlock(chan);
 	}
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 5d7569bfef..e91a65bb3c 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -1229,7 +1229,7 @@ static int quote(struct ast_channel *chan, const char *cmd, char *data, char *bu
 	char *bufptr = buf, *dataptr = data;
 
 	if (len < 3){ /* at least two for quotes and one for binary zero */
-		ast_log(LOG_ERROR, "Not enough buffer");
+		ast_log(LOG_ERROR, "Not enough buffer\n");
 		return -1;
 	}
 
@@ -1268,7 +1268,7 @@ static int csv_quote(struct ast_channel *chan, const char *cmd, char *data, char
 	char *bufptr = buf, *dataptr = data;
 
 	if (len < 3) { /* at least two for quotes and one for binary zero */
-		ast_log(LOG_ERROR, "Not enough buffer");
+		ast_log(LOG_ERROR, "Not enough buffer\n");
 		return -1;
 	}
 
diff --git a/main/cdr.c b/main/cdr.c
index 85c513e16d..2a64ce4f0a 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -554,7 +554,7 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from)
 		}
 
 		if (ast_test_flag(to, AST_CDR_FLAG_LOCKED)) {
-			ast_log(LOG_WARNING, "Merging into locked CDR... no choice.");
+			ast_log(LOG_WARNING, "Merging into locked CDR... no choice.\n");
 			to = zcdr; /* safety-- if all there are is locked CDR's, then.... ?? */
 			lto = NULL;
 		}
diff --git a/main/pbx.c b/main/pbx.c
index f9c8c0df00..cff00d2f3c 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -2904,7 +2904,7 @@ struct ast_exten *pbx_find_extension(struct ast_channel *chan,
 			}
 
 			if (eval && !(tmpdata = ast_str_thread_get(&switch_data, 512))) {
-				ast_log(LOG_WARNING, "Can't evaluate overrideswitch?!");
+				ast_log(LOG_WARNING, "Can't evaluate overrideswitch?!\n");
 				break;
 			} else if (eval) {
 				/* Substitute variables now */
@@ -3061,7 +3061,7 @@ struct ast_exten *pbx_find_extension(struct ast_channel *chan,
 		/* Substitute variables now */
 		if (sw->eval) {
 			if (!(tmpdata = ast_str_thread_get(&switch_data, 512))) {
-				ast_log(LOG_WARNING, "Can't evaluate switch?!");
+				ast_log(LOG_WARNING, "Can't evaluate switch?!\n");
 				continue;
 			}
 			pbx_substitute_variables_helper(chan, sw->data, ast_str_buffer(tmpdata), ast_str_size(tmpdata));
diff --git a/main/tcptls.c b/main/tcptls.c
index 7063b0ced1..066aa068c1 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -175,7 +175,7 @@ static void *handle_tcptls_connection(void *data)
 			tcptls_session->f = fopencookie(tcptls_session->ssl, "w+", cookie_funcs);
 #else
 			/* could add other methods here */
-			ast_debug(2, "no tcptls_session->f methods attempted!");
+			ast_debug(2, "no tcptls_session->f methods attempted!\n");
 #endif
 			if ((tcptls_session->client && !ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_DONT_VERIFY_SERVER))
 				|| (!tcptls_session->client && ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_VERIFY_CLIENT))) {
diff --git a/main/xmldoc.c b/main/xmldoc.c
index 6dfca71927..ab91548f98 100644
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -2009,7 +2009,7 @@ int ast_xmldoc_load_documentation(void)
 		/* Get doc root node and check if it starts with '<docs>' */
 		root_node = ast_xml_get_root(tmpdoc);
 		if (!root_node) {
-			ast_log(LOG_ERROR, "Error getting documentation root node");
+			ast_log(LOG_ERROR, "Error getting documentation root node\n");
 			ast_xml_close(tmpdoc);
 			continue;
 		}
diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c
index 8a30be0735..7ac5605b9b 100644
--- a/res/res_clioriginate.c
+++ b/res/res_clioriginate.c
@@ -181,7 +181,6 @@ static char *handle_orig(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
 	} else if (!strcasecmp("extension", a->argv[3])) {
 		res = orig_exten(a->fd, a->argv[2], a->argv[4]);
 	} else {
-		ast_log(LOG_WARNING, "else");
 		res = CLI_SHOWUSAGE;
 	}
 
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index d43c32b2aa..5dfbab1bcb 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -903,7 +903,7 @@ static int add_cfg_entry(void *arg, int argc, char **argv, char **columnNames)
 	var = ast_variable_new(argv[RES_CONFIG_SQLITE_CONFIG_VAR_NAME], argv[RES_CONFIG_SQLITE_CONFIG_VAR_VAL], "");
 
 	if (!var) {
-		ast_log(LOG_WARNING, "Unable to allocate variable");
+		ast_log(LOG_WARNING, "Unable to allocate variable\n");
 		return 1;
 	}
 
diff --git a/res/res_srtp.c b/res/res_srtp.c
index 0dd3d3eec7..756c62e2fa 100644
--- a/res/res_srtp.c
+++ b/res/res_srtp.c
@@ -475,7 +475,7 @@ static int ast_srtp_add_stream(struct ast_srtp *srtp, struct ast_srtp_policy *po
 	/* For existing streams, replace if its an SSRC stream, or bail if its a wildcard */
 	if ((match = find_policy(srtp, &policy->sp, OBJ_POINTER))) {
 		if (policy->sp.ssrc.type != ssrc_specific) {
-			ast_log(AST_LOG_WARNING, "Cannot replace an existing wildcard policy");
+			ast_log(AST_LOG_WARNING, "Cannot replace an existing wildcard policy\n");
 			ao2_t_ref(match, -1, "Unreffing already existing policy");
 			return -1;
 		} else {