From 29d27bfe0d50c383f6d1e44fa4d72cc244b62437 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 28 Sep 2006 18:09:01 +0000 Subject: Merged revisions 43933 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43933 | file | 2006-09-28 14:05:43 -0400 (Thu, 28 Sep 2006) | 2 lines Put in missing \ns on the end of ast_logs (issue #7936 reported by wojtekka) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43934 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 2 +- channels/chan_mgcp.c | 6 +++--- channels/chan_misdn.c | 4 ++-- channels/chan_sip.c | 7 ++----- channels/chan_skinny.c | 2 +- channels/iax2-provision.c | 2 +- 6 files changed, 10 insertions(+), 13 deletions(-) (limited to 'channels') diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 74e55b0dc..693daa48c 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -5380,7 +5380,7 @@ static int iax2_register(char *value, int lineno) username = strsep(&stringp, "@"); hostname = strsep(&stringp, "@"); if (!hostname) { - ast_log(LOG_WARNING, "Format for registration is user[:secret]@host[:port] at line %d", lineno); + ast_log(LOG_WARNING, "Format for registration is user[:secret]@host[:port] at line %d\n", lineno); return -1; } stringp=username; diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 66946604f..fbdf74982 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -2980,7 +2980,7 @@ static void handle_hd_hf(struct mgcp_subchannel *sub, char *ev) ast_log(LOG_WARNING, "Off hook, but already have owner on %s@%s\n", p->name, p->parent->name); } else { ast_log(LOG_WARNING, "On hook, but already have owner on %s@%s\n", p->name, p->parent->name); - ast_log(LOG_WARNING, "If we're onhook why are we here trying to handle a hd or hf?"); + ast_log(LOG_WARNING, "If we're onhook why are we here trying to handle a hd or hf?\n"); } if (ast_bridged_channel(sub->owner)) ast_queue_control(sub->owner, AST_CONTROL_UNHOLD); @@ -3769,7 +3769,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v) e->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; } } @@ -3886,7 +3886,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v) sub->nat = nat; } 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; } } diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index e6ac85079..c1a0f0dfc 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -1896,7 +1896,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)); @@ -2392,7 +2392,7 @@ static struct ast_frame *process_ast_dsp(struct chan_list *tmp, struct ast_frame if (!f || (f->frametype != AST_FRAME_DTMF)) return frame; - ast_log(LOG_DEBUG, "Detected inband DTMF digit: %c", f->subclass); + ast_log(LOG_DEBUG, "Detected inband DTMF digit: %c\n", f->subclass); if (tmp->faxdetect && (f->subclass == 'f')) { /* Fax tone -- Handle and return NULL */ diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 6fd8113a9..99edcb10b 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3977,7 +3977,7 @@ static struct ast_frame *sip_read(struct ast_channel *ast) p->t38.state = T38_LOCAL_REINVITE; transmit_reinvite_with_t38_sdp(p); if (option_debug > 1) - ast_log(LOG_DEBUG, "T38 state changed to %d on channel %s", p->t38.state, ast->name); + ast_log(LOG_DEBUG, "T38 state changed to %d on channel %s\n", p->t38.state, ast->name); } } else if (!ast_test_flag(&p->flags[0], SIP_PENDINGBYE)) { if (option_debug > 2) @@ -14283,10 +14283,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 790de45b9..232bfd1ca 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -4479,7 +4479,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 c2c4c88c6..b6137a88b 100644 --- a/channels/iax2-provision.c +++ b/channels/iax2-provision.c @@ -283,7 +283,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; -- cgit v1.2.3