Merged revisions 43933 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 28 Sep 2006 18:09:01 +0000 (18:09 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 28 Sep 2006 18:09:01 +0000 (18:09 +0000)
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

18 files changed:
apps/app_alarmreceiver.c
apps/app_festival.c
apps/app_followme.c
apps/app_playback.c
apps/app_rpt.c
channels/chan_iax2.c
channels/chan_mgcp.c
channels/chan_misdn.c
channels/chan_sip.c
channels/chan_skinny.c
channels/iax2-provision.c
funcs/func_timeout.c
include/asterisk/logger.h
main/frame.c
main/udptl.c
res/res_monitor.c
res/res_musiconhold.c
res/res_smdi.c

index d2741df..8afce25 100644 (file)
@@ -136,7 +136,7 @@ static void database_increment( char *key )
        res = ast_db_put(db_family, key, value);
        
        if((res)&&(option_verbose >= 4))
-               ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: database_increment write error");
+               ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: database_increment write error\n");
        
        return; 
 }
index cf0dfcb..6e7a4ff 100644 (file)
@@ -485,7 +485,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
                         * */
                        if ( read_data == -1 )
                        {
-                               ast_log(LOG_WARNING,"Unable to read from cache/festival fd");
+                               ast_log(LOG_WARNING,"Unable to read from cache/festival fd\n");
                               close(fd);
                               ast_config_destroy(cfg);
                               ast_module_user_remove(u);
index 0ee3abc..f83cfa1 100644 (file)
@@ -951,7 +951,7 @@ static int app_exec(struct ast_channel *chan, void *data)
        if (option_debug)
                ast_log(LOG_DEBUG, "New profile %s.\n", args.followmeid);
        if (!f) { 
-               ast_log(LOG_WARNING, "Profile requested, %s, not found in the configuration.", args.followmeid);
+               ast_log(LOG_WARNING, "Profile requested, %s, not found in the configuration.\n", args.followmeid);
                res = -1;
        } else {
                /* XXX TODO: Reinsert the db check value to see whether or not follow-me is on or off */
index 396ed71..5dfb589 100644 (file)
@@ -341,7 +341,7 @@ static int __say_init(int fd, int argc, char *argv[])
                 return RESULT_SHOWUSAGE;
         mode = argv[2];
 
-       ast_log(LOG_WARNING, "init say.c from %s to %s", old_mode, mode);
+       ast_log(LOG_WARNING, "init say.c from %s to %s\n", old_mode, mode);
 
        if (!strcmp(mode, old_mode)) {
                ast_log(LOG_WARNING, "say mode is %s already\n", mode);
index 305e59e..ac966e9 100644 (file)
@@ -2618,7 +2618,7 @@ pthread_attr_t attr;
                rpt_mutex_lock(&myrpt->lock);
                remque((struct qlem *) tele); /* We don't like stuck transmitters, remove it from the queue */
                rpt_mutex_unlock(&myrpt->lock); 
-               ast_log(LOG_WARNING, "Could not create telemetry thread: %s",strerror(res));
+               ast_log(LOG_WARNING, "Could not create telemetry thread: %s\n",strerror(res));
        }
        return;
 }
index 74e55b0..693daa4 100644 (file)
@@ -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;
index 6694660..fbdf749 100644 (file)
@@ -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;
                                                }
                                        }
index e6ac850..c1a0f0d 100644 (file)
@@ -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 */
index 6fd8113..99edcb1 100644 (file)
@@ -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) {
index 790de45..232bfd1 100644 (file)
@@ -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;
                }
index c2c4c88..b6137a8 100644 (file)
@@ -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;
index 206ba94..b88ae07 100644 (file)
@@ -46,7 +46,7 @@ static int timeout_read(struct ast_channel *chan, char *cmd, char *data,
        time_t myt;
 
        if (!data) {
-               ast_log(LOG_ERROR, "Must specify type of timeout to get.");
+               ast_log(LOG_ERROR, "Must specify type of timeout to get.\n");
                return -1;
        }
 
@@ -76,7 +76,7 @@ static int timeout_read(struct ast_channel *chan, char *cmd, char *data,
                break;
 
        default:
-               ast_log(LOG_ERROR, "Unknown timeout type specified.");
+               ast_log(LOG_ERROR, "Unknown timeout type specified.\n");
                break;
        }
 
@@ -91,7 +91,7 @@ static int timeout_write(struct ast_channel *chan, char *cmd, char *data,
        struct tm myt;
 
        if (!data) {
-               ast_log(LOG_ERROR, "Must specify type of timeout to set.");
+               ast_log(LOG_ERROR, "Must specify type of timeout to set.\n");
                return -1;
        }
 
@@ -137,7 +137,7 @@ static int timeout_write(struct ast_channel *chan, char *cmd, char *data,
                break;
 
        default:
-               ast_log(LOG_ERROR, "Unknown timeout type specified.");
+               ast_log(LOG_ERROR, "Unknown timeout type specified.\n");
                break;
        }
 
index 6e48662..b4737d0 100644 (file)
@@ -48,7 +48,7 @@ extern "C" {
 /*! Used for sending a log message */
 /*!
        \brief This is the standard logger function.  Probably the only way you will invoke it would be something like this:
-       ast_log(LOG_WHATEVER, "Problem with the %s Captain.  We should get some more.  Will %d be enough?", "flux capacitor", 10);
+       ast_log(LOG_WHATEVER, "Problem with the %s Captain.  We should get some more.  Will %d be enough?\n", "flux capacitor", 10);
        where WHATEVER is one of ERROR, DEBUG, EVENT, NOTICE, or WARNING depending
        on which log you wish to output to. These are implemented as macros, that
        will provide the function with the needed arguments.
index 51502c8..dc060e1 100644 (file)
@@ -229,7 +229,7 @@ struct ast_frame *ast_smoother_read(struct ast_smoother *s)
        /* IF we have an optimization frame, send it */
        if (s->opt) {
                if (s->opt->offset < AST_FRIENDLY_OFFSET)
-                       ast_log(LOG_WARNING, "Returning a frame of inappropriate offset (%d).",
+                       ast_log(LOG_WARNING, "Returning a frame of inappropriate offset (%d).\n",
                                                        s->opt->offset);
                opt = s->opt;
                s->opt = NULL;
index c7d4b9f..72f316f 100644 (file)
@@ -712,7 +712,7 @@ void ast_udptl_set_error_correction_scheme(struct ast_udptl* udptl, int ec)
                        udptl->error_correction_scheme = UDPTL_ERROR_CORRECTION_NONE;
                        break;
                default:
-                       ast_log(LOG_WARNING, "error correction parameter invalid");
+                       ast_log(LOG_WARNING, "error correction parameter invalid\n");
                };
        } else
                ast_log(LOG_WARNING, "udptl structure is null\n");
index e81325d..ebac350 100644 (file)
@@ -338,7 +338,7 @@ int ast_monitor_change_fname(struct ast_channel *chan, const char *fname_base, i
 {
        char tmp[256];
        if (ast_strlen_zero(fname_base)) {
-               ast_log(LOG_WARNING, "Cannot change monitor filename of channel %s to null", chan->name);
+               ast_log(LOG_WARNING, "Cannot change monitor filename of channel %s to null\n", chan->name);
                return -1;
        }
 
index 3f2e65a..ce630b0 100644 (file)
@@ -1176,7 +1176,7 @@ static int load_module(void)
                res = ast_register_application(app4, moh4_exec, synopsis4, descrip4);
 
        if (!init_classes(0)) {         /* No music classes configured, so skip it */
-               ast_log(LOG_WARNING, "No music on hold classes configured, disabling music on hold.");
+               ast_log(LOG_WARNING, "No music on hold classes configured, disabling music on hold.\n");
        } else {
                ast_install_music_functions(local_ast_moh_start, local_ast_moh_stop, local_ast_moh_cleanup);
        }
index c939aba..c0c7f89 100644 (file)
@@ -143,7 +143,7 @@ int ast_smdi_mwi_unset(struct ast_smdi_interface *iface, const char *mailbox)
        fclose(file);
 
        ASTOBJ_UNLOCK(iface);
-       ast_log(LOG_DEBUG, "Sent MWI unset message for %s on %s", mailbox, iface->name);
+       ast_log(LOG_DEBUG, "Sent MWI unset message for %s on %s\n", mailbox, iface->name);
        return 0;
 }
 
@@ -199,7 +199,7 @@ struct ast_smdi_md_message *ast_smdi_md_message_pop(struct ast_smdi_interface *i
                if (elapsed > iface->msg_expiry) {
                        /* found an expired message */
                        ASTOBJ_UNREF(md_msg, ast_smdi_md_message_destroy);
-                       ast_log(LOG_NOTICE, "Purged expired message from %s SMDI MD message queue.  Message was %ld milliseconds too old.",
+                       ast_log(LOG_NOTICE, "Purged expired message from %s SMDI MD message queue.  Message was %ld milliseconds too old.\n",
                                iface->name, elapsed - iface->msg_expiry);
                        md_msg = ASTOBJ_CONTAINER_UNLINK_START(&iface->md_q);
                }
@@ -267,7 +267,7 @@ extern struct ast_smdi_mwi_message *ast_smdi_mwi_message_pop(struct ast_smdi_int
                if (elapsed > iface->msg_expiry) {
                        /* found an expired message */
                        ASTOBJ_UNREF(mwi_msg, ast_smdi_mwi_message_destroy);
-                       ast_log(LOG_NOTICE, "Purged expired message from %s SMDI MWI message queue.  Message was %ld milliseconds too old.",
+                       ast_log(LOG_NOTICE, "Purged expired message from %s SMDI MWI message queue.  Message was %ld milliseconds too old.\n",
                                iface->name, elapsed - iface->msg_expiry);
                        mwi_msg = ASTOBJ_CONTAINER_UNLINK_START(&iface->mwi_q);
                }