Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv19183
Modified Files:
ChangeLog pbx.c
Log Message:
issue #5805
Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- ChangeLog 21 Nov 2005 01:21:39 -0000 1.163
+++ ChangeLog 21 Nov 2005 01:39:26 -0000 1.164
@@ -1,5 +1,7 @@
2005-11-20 Russell Bryant <[EMAIL PROTECTED]>
+ * pbx.c.c: Remove some useless checks and unnecessary calls to
ast_strlen_zero(). (issue #5805)
+
* cli.c: Remove some unnecessary calls to ast_strlen_zero(). (issue
#5804)
* channels/chan_oss.c configs/oss.conf.sample: Add the ability to set
callerid in oss.conf.
Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -d -r1.303 -r1.304
--- pbx.c 14 Nov 2005 19:00:38 -0000 1.303
+++ pbx.c 21 Nov 2005 01:39:26 -0000 1.304
@@ -1666,14 +1666,14 @@
if (option_debug) {
ast_log(LOG_DEBUG, "Launching
'%s'\n", app->name);
snprintf(atmp, 80,
"STACK-%s-%s-%d", context, exten, priority);
- snprintf(atmp2,
EXT_DATA_SIZE+100, "%s(\"%s\", \"%s\") %s", app->name, c->name,
(!ast_strlen_zero(passdata) ? (char *)passdata : ""), (newstack ? "in new
stack" : "in same stack"));
+ snprintf(atmp2,
EXT_DATA_SIZE+100, "%s(\"%s\", \"%s\") %s", app->name, c->name, passdata,
(newstack ? "in new stack" : "in same stack"));
pbx_builtin_setvar_helper(c,
atmp, atmp2);
}
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3
"Executing %s(\"%s\", \"%s\") %s\n",
term_color(tmp,
app->name, COLOR_BRCYAN, 0, sizeof(tmp)),
term_color(tmp2, c->name, COLOR_BRMAGENTA, 0, sizeof(tmp2)),
-
term_color(tmp3, (!ast_strlen_zero(passdata) ? (char *)passdata : ""),
COLOR_BRMAGENTA, 0, sizeof(tmp3)),
+
term_color(tmp3, passdata, COLOR_BRMAGENTA, 0, sizeof(tmp3)),
(newstack ? "in
new stack" : "in same stack"));
manager_event(EVENT_FLAG_CALL, "Newexten",
"Channel: %s\r\n"
@@ -1683,7 +1683,7 @@
"Application: %s\r\n"
"AppData: %s\r\n"
"Uniqueid: %s\r\n",
- c->name, c->context, c->exten,
c->priority, app->name, passdata ? passdata : "(NULL)", c->uniqueid);
+ c->name, c->context, c->exten,
c->priority, app->name, passdata, c->uniqueid);
res = pbx_exec(c, app, passdata, newstack);
return res;
} else {
@@ -2473,7 +2473,7 @@
if (option_maxload) {
getloadavg(&curloadavg, 1);
if (curloadavg >= option_maxload) {
- ast_log(LOG_NOTICE, "Maximum loadavg limit of %lf load
exceeded by '%s' (currently %f)!\n", option_maxload, c->name, curloadavg);
+ ast_log(LOG_NOTICE, "Maximum loadavg limit of %f load
exceeded by '%s' (currently %f)!\n", option_maxload, c->name, curloadavg);
failed = -1;
}
}
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
