[asterisk-commits] qwell: branch qwell/ast_log-channelize r51313 -
in /team/qwell/ast_log-channe...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Jan 19 11:01:24 MST 2007
Author: qwell
Date: Fri Jan 19 12:01:21 2007
New Revision: 51313
URL: http://svn.digium.com/view/asterisk?view=rev&rev=51313
Log:
massive patch (over 1.6 MB) to change ast_cli API
Modified:
team/qwell/ast_log-channelize/ (props changed)
team/qwell/ast_log-channelize/apps/app_adsiprog.c
team/qwell/ast_log-channelize/apps/app_alarmreceiver.c
team/qwell/ast_log-channelize/apps/app_amd.c
team/qwell/ast_log-channelize/apps/app_authenticate.c
team/qwell/ast_log-channelize/apps/app_chanisavail.c
team/qwell/ast_log-channelize/apps/app_channelredirect.c
team/qwell/ast_log-channelize/apps/app_chanspy.c
team/qwell/ast_log-channelize/apps/app_controlplayback.c
team/qwell/ast_log-channelize/apps/app_db.c
team/qwell/ast_log-channelize/apps/app_dial.c
team/qwell/ast_log-channelize/apps/app_dictate.c
team/qwell/ast_log-channelize/apps/app_directed_pickup.c
team/qwell/ast_log-channelize/apps/app_directory.c
team/qwell/ast_log-channelize/apps/app_disa.c
team/qwell/ast_log-channelize/apps/app_exec.c
team/qwell/ast_log-channelize/apps/app_externalivr.c
team/qwell/ast_log-channelize/apps/app_festival.c
team/qwell/ast_log-channelize/apps/app_flash.c
team/qwell/ast_log-channelize/apps/app_followme.c
team/qwell/ast_log-channelize/apps/app_forkcdr.c
team/qwell/ast_log-channelize/apps/app_ices.c
team/qwell/ast_log-channelize/apps/app_image.c
team/qwell/ast_log-channelize/apps/app_macro.c
team/qwell/ast_log-channelize/apps/app_meetme.c
team/qwell/ast_log-channelize/apps/app_milliwatt.c
team/qwell/ast_log-channelize/apps/app_mixmonitor.c
team/qwell/ast_log-channelize/apps/app_morsecode.c
team/qwell/ast_log-channelize/apps/app_mp3.c
team/qwell/ast_log-channelize/apps/app_nbscat.c
team/qwell/ast_log-channelize/apps/app_page.c
team/qwell/ast_log-channelize/apps/app_parkandannounce.c
team/qwell/ast_log-channelize/apps/app_playback.c
team/qwell/ast_log-channelize/apps/app_privacy.c
team/qwell/ast_log-channelize/apps/app_queue.c
team/qwell/ast_log-channelize/apps/app_read.c
team/qwell/ast_log-channelize/apps/app_readfile.c
team/qwell/ast_log-channelize/apps/app_record.c
team/qwell/ast_log-channelize/apps/app_senddtmf.c
team/qwell/ast_log-channelize/apps/app_sendtext.c
team/qwell/ast_log-channelize/apps/app_setcallerid.c
team/qwell/ast_log-channelize/apps/app_sms.c
team/qwell/ast_log-channelize/apps/app_softhangup.c
team/qwell/ast_log-channelize/apps/app_stack.c
team/qwell/ast_log-channelize/apps/app_system.c
team/qwell/ast_log-channelize/apps/app_talkdetect.c
team/qwell/ast_log-channelize/apps/app_test.c
team/qwell/ast_log-channelize/apps/app_transfer.c
team/qwell/ast_log-channelize/apps/app_url.c
team/qwell/ast_log-channelize/apps/app_userevent.c
team/qwell/ast_log-channelize/apps/app_verbose.c
team/qwell/ast_log-channelize/apps/app_voicemail.c
team/qwell/ast_log-channelize/apps/app_waitforring.c
team/qwell/ast_log-channelize/apps/app_waitforsilence.c
team/qwell/ast_log-channelize/apps/app_while.c
team/qwell/ast_log-channelize/apps/app_zapbarge.c
team/qwell/ast_log-channelize/apps/app_zapras.c
team/qwell/ast_log-channelize/apps/app_zapscan.c
team/qwell/ast_log-channelize/cdr/cdr_csv.c
team/qwell/ast_log-channelize/cdr/cdr_custom.c
team/qwell/ast_log-channelize/cdr/cdr_manager.c
team/qwell/ast_log-channelize/cdr/cdr_odbc.c
team/qwell/ast_log-channelize/cdr/cdr_pgsql.c
team/qwell/ast_log-channelize/cdr/cdr_radius.c
team/qwell/ast_log-channelize/cdr/cdr_sqlite.c
team/qwell/ast_log-channelize/cdr/cdr_tds.c
team/qwell/ast_log-channelize/channels/chan_agent.c
team/qwell/ast_log-channelize/channels/chan_alsa.c
team/qwell/ast_log-channelize/channels/chan_features.c
team/qwell/ast_log-channelize/channels/chan_gtalk.c
team/qwell/ast_log-channelize/channels/chan_h323.c
team/qwell/ast_log-channelize/channels/chan_iax2.c
team/qwell/ast_log-channelize/channels/chan_jingle.c
team/qwell/ast_log-channelize/channels/chan_local.c
team/qwell/ast_log-channelize/channels/chan_mgcp.c
team/qwell/ast_log-channelize/channels/chan_misdn.c
team/qwell/ast_log-channelize/channels/chan_nbs.c
team/qwell/ast_log-channelize/channels/chan_oss.c
team/qwell/ast_log-channelize/channels/chan_phone.c
team/qwell/ast_log-channelize/channels/chan_sip.c
team/qwell/ast_log-channelize/channels/chan_skinny.c
team/qwell/ast_log-channelize/channels/chan_vpb.cc
team/qwell/ast_log-channelize/channels/chan_zap.c
team/qwell/ast_log-channelize/channels/iax2-provision.c
team/qwell/ast_log-channelize/codecs/codec_gsm.c
team/qwell/ast_log-channelize/codecs/codec_ilbc.c
team/qwell/ast_log-channelize/codecs/codec_lpc10.c
team/qwell/ast_log-channelize/codecs/codec_speex.c
team/qwell/ast_log-channelize/codecs/codec_zap.c
team/qwell/ast_log-channelize/formats/format_g723.c
team/qwell/ast_log-channelize/formats/format_g726.c
team/qwell/ast_log-channelize/formats/format_g729.c
team/qwell/ast_log-channelize/formats/format_gsm.c
team/qwell/ast_log-channelize/formats/format_h263.c
team/qwell/ast_log-channelize/formats/format_h264.c
team/qwell/ast_log-channelize/formats/format_ilbc.c
team/qwell/ast_log-channelize/formats/format_jpeg.c
team/qwell/ast_log-channelize/formats/format_ogg_vorbis.c
team/qwell/ast_log-channelize/formats/format_pcm.c
team/qwell/ast_log-channelize/formats/format_sln.c
team/qwell/ast_log-channelize/formats/format_vox.c
team/qwell/ast_log-channelize/formats/format_wav.c
team/qwell/ast_log-channelize/formats/format_wav_gsm.c
team/qwell/ast_log-channelize/funcs/func_base64.c
team/qwell/ast_log-channelize/funcs/func_callerid.c
team/qwell/ast_log-channelize/funcs/func_channel.c
team/qwell/ast_log-channelize/funcs/func_curl.c
team/qwell/ast_log-channelize/funcs/func_cut.c
team/qwell/ast_log-channelize/funcs/func_db.c
team/qwell/ast_log-channelize/funcs/func_enum.c
team/qwell/ast_log-channelize/funcs/func_groupcount.c
team/qwell/ast_log-channelize/funcs/func_logic.c
team/qwell/ast_log-channelize/funcs/func_math.c
team/qwell/ast_log-channelize/funcs/func_md5.c
team/qwell/ast_log-channelize/funcs/func_odbc.c
team/qwell/ast_log-channelize/funcs/func_rand.c
team/qwell/ast_log-channelize/funcs/func_realtime.c
team/qwell/ast_log-channelize/funcs/func_sha1.c
team/qwell/ast_log-channelize/funcs/func_shell.c
team/qwell/ast_log-channelize/funcs/func_strings.c
team/qwell/ast_log-channelize/funcs/func_timeout.c
team/qwell/ast_log-channelize/funcs/func_uri.c
team/qwell/ast_log-channelize/funcs/func_version.c
team/qwell/ast_log-channelize/include/asterisk/astobj.h
team/qwell/ast_log-channelize/include/asterisk/channel.h
team/qwell/ast_log-channelize/include/asterisk/logger.h
team/qwell/ast_log-channelize/include/asterisk/say.h
team/qwell/ast_log-channelize/include/asterisk/utils.h
team/qwell/ast_log-channelize/main/abstract_jb.c
team/qwell/ast_log-channelize/main/acl.c
team/qwell/ast_log-channelize/main/app.c
team/qwell/ast_log-channelize/main/ast_expr2.c
team/qwell/ast_log-channelize/main/ast_expr2.fl
team/qwell/ast_log-channelize/main/ast_expr2.y
team/qwell/ast_log-channelize/main/ast_expr2f.c
team/qwell/ast_log-channelize/main/asterisk.c
team/qwell/ast_log-channelize/main/autoservice.c
team/qwell/ast_log-channelize/main/callerid.c
team/qwell/ast_log-channelize/main/cdr.c
team/qwell/ast_log-channelize/main/channel.c
team/qwell/ast_log-channelize/main/cli.c
team/qwell/ast_log-channelize/main/config.c
team/qwell/ast_log-channelize/main/cryptostub.c
team/qwell/ast_log-channelize/main/db.c
team/qwell/ast_log-channelize/main/devicestate.c
team/qwell/ast_log-channelize/main/dns.c
team/qwell/ast_log-channelize/main/dnsmgr.c
team/qwell/ast_log-channelize/main/dsp.c
team/qwell/ast_log-channelize/main/enum.c
team/qwell/ast_log-channelize/main/file.c
team/qwell/ast_log-channelize/main/frame.c
team/qwell/ast_log-channelize/main/http.c
team/qwell/ast_log-channelize/main/image.c
team/qwell/ast_log-channelize/main/indications.c
team/qwell/ast_log-channelize/main/io.c
team/qwell/ast_log-channelize/main/loader.c
team/qwell/ast_log-channelize/main/logger.c
team/qwell/ast_log-channelize/main/manager.c
team/qwell/ast_log-channelize/main/netsock.c
team/qwell/ast_log-channelize/main/pbx.c
team/qwell/ast_log-channelize/main/rtp.c
team/qwell/ast_log-channelize/main/say.c
team/qwell/ast_log-channelize/main/sched.c
team/qwell/ast_log-channelize/main/slinfactory.c
team/qwell/ast_log-channelize/main/srv.c
team/qwell/ast_log-channelize/main/tdd.c
team/qwell/ast_log-channelize/main/translate.c
team/qwell/ast_log-channelize/main/udptl.c
team/qwell/ast_log-channelize/main/utils.c
team/qwell/ast_log-channelize/pbx/ael/ael.flex
team/qwell/ast_log-channelize/pbx/ael/ael.tab.c
team/qwell/ast_log-channelize/pbx/ael/ael.y
team/qwell/ast_log-channelize/pbx/ael/ael_lex.c
team/qwell/ast_log-channelize/pbx/pbx_ael.c
team/qwell/ast_log-channelize/pbx/pbx_config.c
team/qwell/ast_log-channelize/pbx/pbx_dundi.c
team/qwell/ast_log-channelize/pbx/pbx_loopback.c
team/qwell/ast_log-channelize/pbx/pbx_realtime.c
team/qwell/ast_log-channelize/pbx/pbx_spool.c
team/qwell/ast_log-channelize/res/res_adsi.c
team/qwell/ast_log-channelize/res/res_agi.c
team/qwell/ast_log-channelize/res/res_config_odbc.c
team/qwell/ast_log-channelize/res/res_config_pgsql.c
team/qwell/ast_log-channelize/res/res_crypto.c
team/qwell/ast_log-channelize/res/res_features.c
team/qwell/ast_log-channelize/res/res_indications.c
team/qwell/ast_log-channelize/res/res_jabber.c
team/qwell/ast_log-channelize/res/res_monitor.c
team/qwell/ast_log-channelize/res/res_musiconhold.c
team/qwell/ast_log-channelize/res/res_odbc.c
team/qwell/ast_log-channelize/res/res_smdi.c
team/qwell/ast_log-channelize/res/res_snmp.c
team/qwell/ast_log-channelize/utils/ael_main.c
Propchange: team/qwell/ast_log-channelize/
------------------------------------------------------------------------------
svnmerge-integrated = /trunk:1-51305
Modified: team/qwell/ast_log-channelize/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/apps/app_adsiprog.c?view=diff&rev=51313&r1=51312&r2=51313
==============================================================================
--- team/qwell/ast_log-channelize/apps/app_adsiprog.c (original)
+++ team/qwell/ast_log-channelize/apps/app_adsiprog.c Fri Jan 19 12:01:21 2007
@@ -240,7 +240,7 @@
tmp++;
}
if (quoted) {
- ast_log(LOG_WARNING, "Mismatched quotes at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Mismatched quotes at line %d of %s\n", lineno, script);
return NULL;
}
*tmp = '\0';
@@ -261,11 +261,11 @@
int bytes=0;
a = get_token(&args, script, lineno);
if (!a) {
- ast_log(LOG_WARNING, "Expecting something to send for SENDDTMF at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Expecting something to send for SENDDTMF at line %d of %s\n", lineno, script);
return 0;
}
if (process_token(dtmfstr, a, sizeof(dtmfstr) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "Invalid token for SENDDTMF at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid token for SENDDTMF at line %d of %s\n", lineno, script);
return 0;
}
a = dtmfstr;
@@ -275,7 +275,7 @@
buf++;
bytes++;
} else
- ast_log(LOG_WARNING, "'%c' is not a valid DTMF tone at line %d of %s\n", *a, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%c' is not a valid DTMF tone at line %d of %s\n", *a, lineno, script);
a++;
}
return bytes;
@@ -290,7 +290,7 @@
page = get_token(&args, script, lineno);
gline = get_token(&args, script, lineno);
if (!page || !gline) {
- ast_log(LOG_WARNING, "Expecting page and line number for GOTOLINE at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Expecting page and line number for GOTOLINE at line %d of %s\n", lineno, script);
return 0;
}
if (!strcasecmp(page, "INFO")) {
@@ -298,11 +298,11 @@
} else if (!strcasecmp(page, "COMM")) {
cmd = 0x80;
} else {
- ast_log(LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got got '%s' at line %d of %s\n", page, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got got '%s' at line %d of %s\n", page, lineno, script);
return 0;
}
if (process_token(&line, gline, sizeof(line), ARG_NUMBER)) {
- ast_log(LOG_WARNING, "Invalid line number '%s' at line %d of %s\n", gline, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid line number '%s' at line %d of %s\n", gline, lineno, script);
return 0;
}
cmd |= line;
@@ -320,7 +320,7 @@
dir = get_token(&args, script, lineno);
gline = get_token(&args, script, lineno);
if (!dir || !gline) {
- ast_log(LOG_WARNING, "Expecting direction and number of lines for GOTOLINEREL at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Expecting direction and number of lines for GOTOLINEREL at line %d of %s\n", lineno, script);
return 0;
}
if (!strcasecmp(dir, "UP")) {
@@ -328,11 +328,11 @@
} else if (!strcasecmp(dir, "DOWN")) {
cmd = 0x20;
} else {
- ast_log(LOG_WARNING, "Expecting either 'UP' or 'DOWN' direction, got '%s' at line %d of %s\n", dir, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Expecting either 'UP' or 'DOWN' direction, got '%s' at line %d of %s\n", dir, lineno, script);
return 0;
}
if (process_token(&line, gline, sizeof(line), ARG_NUMBER)) {
- ast_log(LOG_WARNING, "Invalid line number '%s' at line %d of %s\n", gline, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid line number '%s' at line %d of %s\n", gline, lineno, script);
return 0;
}
cmd |= line;
@@ -347,11 +347,11 @@
int ms;
gtime = get_token(&args, script, lineno);
if (!gtime) {
- ast_log(LOG_WARNING, "Expecting number of milliseconds to wait at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Expecting number of milliseconds to wait at line %d of %s\n", lineno, script);
return 0;
}
if (process_token(&ms, gtime, sizeof(ms), ARG_NUMBER)) {
- ast_log(LOG_WARNING, "Invalid delay milliseconds '%s' at line %d of %s\n", gtime, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid delay milliseconds '%s' at line %d of %s\n", gtime, lineno, script);
return 0;
}
buf[0] = 0x90;
@@ -368,11 +368,11 @@
int state;
gstate = get_token(&args, script, lineno);
if (!gstate) {
- ast_log(LOG_WARNING, "Expecting state number at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Expecting state number at line %d of %s\n", lineno, script);
return 0;
}
if (process_token(&state, gstate, sizeof(state), ARG_NUMBER)) {
- ast_log(LOG_WARNING, "Invalid state number '%s' at line %d of %s\n", gstate, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid state number '%s' at line %d of %s\n", gstate, lineno, script);
return 0;
}
buf[0] = id;
@@ -385,7 +385,7 @@
char *tok;
tok = get_token(&args, script, lineno);
if (tok)
- ast_log(LOG_WARNING, "Clearing timer requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Clearing timer requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id;
/* For some reason the clear code is different slightly */
@@ -406,7 +406,7 @@
if (!create)
return NULL;
if (state->numflags > 6) {
- ast_log(LOG_WARNING, "No more flag space at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "No more flag space at line %d of %s\n", lineno, script);
return NULL;
}
ast_copy_string(state->flags[state->numflags].vname, name, sizeof(state->flags[state->numflags].vname));
@@ -422,16 +422,16 @@
struct adsi_flag *flag;
tok = get_token(&args, script, lineno);
if (!tok) {
- ast_log(LOG_WARNING, "Setting flag requires a flag number at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Setting flag requires a flag number at line %d of %s\n", lineno, script);
return 0;
}
if (process_token(sname, tok, sizeof(sname) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "Invalid flag '%s' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid flag '%s' at line %d of %s\n", tok, lineno, script);
return 0;
}
flag = getflagbyname(state, sname, script, lineno, 0);
if (!flag) {
- ast_log(LOG_WARNING, "Flag '%s' is undeclared at line %d of %s\n", sname, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Flag '%s' is undeclared at line %d of %s\n", sname, lineno, script);
return 0;
}
buf[0] = id;
@@ -446,16 +446,16 @@
char sname[80];
tok = get_token(&args, script, lineno);
if (!tok) {
- ast_log(LOG_WARNING, "Clearing flag requires a flag number at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Clearing flag requires a flag number at line %d of %s\n", lineno, script);
return 0;
}
if (process_token(sname, tok, sizeof(sname) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "Invalid flag '%s' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid flag '%s' at line %d of %s\n", tok, lineno, script);
return 0;
}
flag = getflagbyname(state, sname, script, lineno, 0);
if (!flag) {
- ast_log(LOG_WARNING, "Flag '%s' is undeclared at line %d of %s\n", sname, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Flag '%s' is undeclared at line %d of %s\n", sname, lineno, script);
return 0;
}
buf[0] = id;
@@ -469,11 +469,11 @@
int secs;
tok = get_token(&args, script, lineno);
if (!tok) {
- ast_log(LOG_WARNING, "Missing number of seconds at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Missing number of seconds at line %d of %s\n", lineno, script);
return 0;
}
if (process_token(&secs, tok, sizeof(secs), ARG_NUMBER)) {
- ast_log(LOG_WARNING, "Invalid number of seconds '%s' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid number of seconds '%s' at line %d of %s\n", tok, lineno, script);
return 0;
}
buf[0] = id;
@@ -509,7 +509,7 @@
if (!strcasecmp(state->keys[x].vname, name))
return &state->keys[x];
if (state->numkeys > 61) {
- ast_log(LOG_WARNING, "No more key space at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "No more key space at line %d of %s\n", lineno, script);
return NULL;
}
ast_copy_string(state->keys[state->numkeys].vname, name, sizeof(state->keys[state->numkeys].vname));
@@ -525,7 +525,7 @@
if (!strcasecmp(state->subs[x].vname, name))
return &state->subs[x];
if (state->numsubs > 127) {
- ast_log(LOG_WARNING, "No more subscript space at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "No more subscript space at line %d of %s\n", lineno, script);
return NULL;
}
ast_copy_string(state->subs[state->numsubs].vname, name, sizeof(state->subs[state->numsubs].vname));
@@ -544,7 +544,7 @@
if (!create)
return NULL;
if (state->numstates > 253) {
- ast_log(LOG_WARNING, "No more state space at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "No more state space at line %d of %s\n", lineno, script);
return NULL;
}
ast_copy_string(state->states[state->numstates].vname, name, sizeof(state->states[state->numstates].vname));
@@ -563,7 +563,7 @@
if (!create)
return NULL;
if (state->numdisplays > 61) {
- ast_log(LOG_WARNING, "No more display space at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "No more display space at line %d of %s\n", lineno, script);
return NULL;
}
ast_copy_string(state->displays[state->numdisplays].vname, name, sizeof(state->displays[state->numdisplays].vname));
@@ -592,23 +592,23 @@
/* Check for trailing UNLESS flag */
tok = get_token(&args, script, lineno);
if (!tok) {
- ast_log(LOG_WARNING, "Missing argument for UNLESS clause at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Missing argument for UNLESS clause at line %d of %s\n", lineno, script);
} else if (process_token(newkey, tok, sizeof(newkey) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "Invalid flag name '%s' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid flag name '%s' at line %d of %s\n", tok, lineno, script);
} else if (!(flag = getflagbyname(state, newkey, script, lineno, 0))) {
- ast_log(LOG_WARNING, "Flag '%s' is undeclared at line %d of %s\n", newkey, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Flag '%s' is undeclared at line %d of %s\n", newkey, lineno, script);
} else
flagid = flag->id;
if ((tok = get_token(&args, script, lineno)))
- ast_log(LOG_WARNING, "Extra arguments after UNLESS clause: '%s' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Extra arguments after UNLESS clause: '%s' at line %d of %s\n", tok, lineno, script);
break;
}
if (x > 5) {
- ast_log(LOG_WARNING, "Only 6 keys can be defined, ignoring '%s' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Only 6 keys can be defined, ignoring '%s' at line %d of %s\n", tok, lineno, script);
break;
}
if (process_token(newkey, tok, sizeof(newkey) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "Invalid token for key name: %s\n", tok);
+ ast_log(NULL, LOG_WARNING, "Invalid token for key name: %s\n", tok);
continue;
}
@@ -637,24 +637,24 @@
/* Get display */
tok = get_token(&args, script, lineno);
if (!tok || process_token(dispname, tok, sizeof(dispname) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "Invalid display name: %s at line %d of %s\n", tok ? tok : "<nothing>", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid display name: %s at line %d of %s\n", tok ? tok : "<nothing>", lineno, script);
return 0;
}
disp = getdisplaybyname(state, dispname, script, lineno, 0);
if (!disp) {
- ast_log(LOG_WARNING, "Display '%s' is undefined at line %d of %s\n", dispname, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Display '%s' is undefined at line %d of %s\n", dispname, lineno, script);
return 0;
}
tok = get_token(&args, script, lineno);
if (!tok || strcasecmp(tok, "AT")) {
- ast_log(LOG_WARNING, "Missing token 'AT' at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Missing token 'AT' at line %d of %s\n", lineno, script);
return 0;
}
/* Get line number */
tok = get_token(&args, script, lineno);
if (!tok || process_token(&line, tok, sizeof(line), ARG_NUMBER)) {
- ast_log(LOG_WARNING, "Invalid line: '%s' at line %d of %s\n", tok ? tok : "<nothing>", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid line: '%s' at line %d of %s\n", tok ? tok : "<nothing>", lineno, script);
return 0;
}
tok = get_token(&args, script, lineno);
@@ -666,12 +666,12 @@
/* Check for trailing UNLESS flag */
tok = get_token(&args, script, lineno);
if (!tok) {
- ast_log(LOG_WARNING, "Missing argument for UNLESS clause at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Missing argument for UNLESS clause at line %d of %s\n", lineno, script);
} else if (process_token(&flag, tok, sizeof(flag), ARG_NUMBER)) {
- ast_log(LOG_WARNING, "Invalid flag number '%s' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid flag number '%s' at line %d of %s\n", tok, lineno, script);
}
if ((tok = get_token(&args, script, lineno)))
- ast_log(LOG_WARNING, "Extra arguments after UNLESS clause: '%s' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Extra arguments after UNLESS clause: '%s' at line %d of %s\n", tok, lineno, script);
}
buf[0] = id;
@@ -685,7 +685,7 @@
char *tok;
tok = get_token(&args, script, lineno);
if (tok)
- ast_log(LOG_WARNING, "Clearing display requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Clearing display requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id;
buf[1] = 0x00;
@@ -697,7 +697,7 @@
char *tok;
tok = get_token(&args, script, lineno);
if (tok)
- ast_log(LOG_WARNING, "Digitdirect requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Digitdirect requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id;
buf[1] = 0x7;
@@ -709,7 +709,7 @@
char *tok;
tok = get_token(&args, script, lineno);
if (tok)
- ast_log(LOG_WARNING, "CLEARCB1 requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "CLEARCB1 requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id;
buf[1] = 0;
@@ -721,7 +721,7 @@
char *tok;
tok = get_token(&args, script, lineno);
if (tok)
- ast_log(LOG_WARNING, "Digitcollect requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Digitcollect requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id;
buf[1] = 0xf;
@@ -735,11 +735,11 @@
struct adsi_subscript *sub;
tok = get_token(&args, script, lineno);
if (!tok) {
- ast_log(LOG_WARNING, "Missing subscript to call at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Missing subscript to call at line %d of %s\n", lineno, script);
return 0;
}
if (process_token(subscript, tok, sizeof(subscript) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "Invalid number of seconds '%s' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid number of seconds '%s' at line %d of %s\n", tok, lineno, script);
return 0;
}
sub = getsubbyname(state, subscript, script, lineno);
@@ -763,12 +763,12 @@
struct adsi_subscript *sub;
tok = get_token(&args, script, lineno);
if (!tok) {
- ast_log(LOG_WARNING, "Missing event for 'ONEVENT' at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Missing event for 'ONEVENT' at line %d of %s\n", lineno, script);
return 0;
}
event = geteventbyname(tok);
if (event < 1) {
- ast_log(LOG_WARNING, "'%s' is not a valid event name, at line %d of %s\n", args, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%s' is not a valid event name, at line %d of %s\n", args, lineno, script);
return 0;
}
tok = get_token(&args, script, lineno);
@@ -776,17 +776,17 @@
(sawin && !strcasecmp(tok, "OR"))) {
sawin = 1;
if (scnt > 7) {
- ast_log(LOG_WARNING, "No more than 8 states may be specified for inclusion at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "No more than 8 states may be specified for inclusion at line %d of %s\n", lineno, script);
return 0;
}
/* Process 'in' things */
tok = get_token(&args, script, lineno);
if (process_token(sname, tok, sizeof(sname), ARG_STRING)) {
- ast_log(LOG_WARNING, "'%s' is not a valid state name at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%s' is not a valid state name at line %d of %s\n", tok, lineno, script);
return 0;
}
if ((snums[scnt] = getstatebyname(state, sname, script, lineno, 0) < 0)) {
- ast_log(LOG_WARNING, "State '%s' not declared at line %d of %s\n", sname, lineno, script);
+ ast_log(NULL, LOG_WARNING, "State '%s' not declared at line %d of %s\n", sname, lineno, script);
return 0;
}
scnt++;
@@ -798,17 +798,17 @@
if (!tok)
tok = "<nothing>";
if (sawin)
- ast_log(LOG_WARNING, "Got '%s' while looking for 'GOTO' or 'OR' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Got '%s' while looking for 'GOTO' or 'OR' at line %d of %s\n", tok, lineno, script);
else
- ast_log(LOG_WARNING, "Got '%s' while looking for 'GOTO' or 'IN' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Got '%s' while looking for 'GOTO' or 'IN' at line %d of %s\n", tok, lineno, script);
}
tok = get_token(&args, script, lineno);
if (!tok) {
- ast_log(LOG_WARNING, "Missing subscript to call at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Missing subscript to call at line %d of %s\n", lineno, script);
return 0;
}
if (process_token(subscript, tok, sizeof(subscript) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "Invalid subscript '%s' at line %d of %s\n", tok, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Invalid subscript '%s' at line %d of %s\n", tok, lineno, script);
return 0;
}
sub = getsubbyname(state, subscript, script, lineno);
@@ -903,15 +903,15 @@
if ((key->retstrlen + res - key->initlen) <= MAX_RET_CODE)
key->retstrlen += res;
else
- ast_log(LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", kcmds[x].name, key->vname, lineno, script);
+ ast_log(NULL, LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", kcmds[x].name, key->vname, lineno, script);
} else {
if ((unused = get_token(&args, script, lineno)))
- ast_log(LOG_WARNING, "'%s' takes no arguments at line %d of %s (token is '%s')\n", kcmds[x].name, lineno, script, unused);
+ ast_log(NULL, LOG_WARNING, "'%s' takes no arguments at line %d of %s (token is '%s')\n", kcmds[x].name, lineno, script, unused);
if ((key->retstrlen + 1 - key->initlen) <= MAX_RET_CODE) {
key->retstr[key->retstrlen] = kcmds[x].id;
key->retstrlen++;
} else
- ast_log(LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", kcmds[x].name, key->vname, lineno, script);
+ ast_log(NULL, LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", kcmds[x].name, key->vname, lineno, script);
}
return 0;
}
@@ -933,17 +933,17 @@
if ((sub->datalen + res + 1) <= max)
sub->datalen += res;
else {
- ast_log(LOG_WARNING, "No space for '%s' code in subscript '%s' at line %d of %s\n", opcmds[x].name, sub->vname, lineno, script);
+ ast_log(NULL, LOG_WARNING, "No space for '%s' code in subscript '%s' at line %d of %s\n", opcmds[x].name, sub->vname, lineno, script);
return -1;
}
} else {
if ((unused = get_token(&args, script, lineno)))
- ast_log(LOG_WARNING, "'%s' takes no arguments at line %d of %s (token is '%s')\n", opcmds[x].name, lineno, script, unused);
+ ast_log(NULL, LOG_WARNING, "'%s' takes no arguments at line %d of %s (token is '%s')\n", opcmds[x].name, lineno, script, unused);
if ((sub->datalen + 2) <= max) {
sub->data[sub->datalen] = opcmds[x].id;
sub->datalen++;
} else {
- ast_log(LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", opcmds[x].name, sub->vname, lineno, script);
+ ast_log(NULL, LOG_WARNING, "No space for '%s' code in key '%s' at line %d of %s\n", opcmds[x].name, sub->vname, lineno, script);
return -1;
}
}
@@ -979,87 +979,87 @@
args = get_token(&buf, script, lineno);
if (args) {
if (process_token(state->desc, args, sizeof(state->desc) - 1, ARG_STRING))
- ast_log(LOG_WARNING, "'%s' is not a valid token for DESCRIPTION at line %d of %s\n", args, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%s' is not a valid token for DESCRIPTION at line %d of %s\n", args, lineno, script);
} else
- ast_log(LOG_WARNING, "Missing argument for DESCRIPTION at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Missing argument for DESCRIPTION at line %d of %s\n", lineno, script);
} else if (!strcasecmp(keyword, "VERSION")) {
args = get_token(&buf, script, lineno);
if (args) {
if (process_token(&state->ver, args, sizeof(state->ver) - 1, ARG_NUMBER))
- ast_log(LOG_WARNING, "'%s' is not a valid token for VERSION at line %d of %s\n", args, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%s' is not a valid token for VERSION at line %d of %s\n", args, lineno, script);
} else
- ast_log(LOG_WARNING, "Missing argument for VERSION at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Missing argument for VERSION at line %d of %s\n", lineno, script);
} else if (!strcasecmp(keyword, "SECURITY")) {
args = get_token(&buf, script, lineno);
if (args) {
if (process_token(state->sec, args, sizeof(state->sec) - 1, ARG_STRING | ARG_NUMBER))
- ast_log(LOG_WARNING, "'%s' is not a valid token for SECURITY at line %d of %s\n", args, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%s' is not a valid token for SECURITY at line %d of %s\n", args, lineno, script);
} else
- ast_log(LOG_WARNING, "Missing argument for SECURITY at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Missing argument for SECURITY at line %d of %s\n", lineno, script);
} else if (!strcasecmp(keyword, "FDN")) {
args = get_token(&buf, script, lineno);
if (args) {
if (process_token(state->fdn, args, sizeof(state->fdn) - 1, ARG_STRING | ARG_NUMBER))
- ast_log(LOG_WARNING, "'%s' is not a valid token for FDN at line %d of %s\n", args, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%s' is not a valid token for FDN at line %d of %s\n", args, lineno, script);
} else
- ast_log(LOG_WARNING, "Missing argument for FDN at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Missing argument for FDN at line %d of %s\n", lineno, script);
} else if (!strcasecmp(keyword, "KEY")) {
args = get_token(&buf, script, lineno);
if (!args) {
- ast_log(LOG_WARNING, "KEY definition missing name at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "KEY definition missing name at line %d of %s\n", lineno, script);
break;
}
if (process_token(vname, args, sizeof(vname) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "'%s' is not a valid token for a KEY name at line %d of %s\n", args, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%s' is not a valid token for a KEY name at line %d of %s\n", args, lineno, script);
break;
}
state->key = getkeybyname(state, vname, script, lineno);
if (!state->key) {
- ast_log(LOG_WARNING, "Out of key space at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Out of key space at line %d of %s\n", lineno, script);
break;
}
if (state->key->defined) {
- ast_log(LOG_WARNING, "Cannot redefine key '%s' at line %d of %s\n", vname, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Cannot redefine key '%s' at line %d of %s\n", vname, lineno, script);
break;
}
args = get_token(&buf, script, lineno);
if (!args || strcasecmp(args, "IS")) {
- ast_log(LOG_WARNING, "Expecting 'IS', but got '%s' at line %d of %s\n", args ? args : "<nothing>", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Expecting 'IS', but got '%s' at line %d of %s\n", args ? args : "<nothing>", lineno, script);
break;
}
args = get_token(&buf, script, lineno);
if (!args) {
- ast_log(LOG_WARNING, "KEY definition missing short name at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "KEY definition missing short name at line %d of %s\n", lineno, script);
break;
}
if (process_token(tmp, args, sizeof(tmp) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "'%s' is not a valid token for a KEY short name at line %d of %s\n", args, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%s' is not a valid token for a KEY short name at line %d of %s\n", args, lineno, script);
break;
}
args = get_token(&buf, script, lineno);
if (args) {
if (strcasecmp(args, "OR")) {
- ast_log(LOG_WARNING, "Expecting 'OR' but got '%s' instead at line %d of %s\n", args, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Expecting 'OR' but got '%s' instead at line %d of %s\n", args, lineno, script);
break;
}
args = get_token(&buf, script, lineno);
if (!args) {
- ast_log(LOG_WARNING, "KEY definition missing optional long name at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "KEY definition missing optional long name at line %d of %s\n", lineno, script);
break;
}
if (process_token(tmp2, args, sizeof(tmp2) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "'%s' is not a valid token for a KEY long name at line %d of %s\n", args, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%s' is not a valid token for a KEY long name at line %d of %s\n", args, lineno, script);
break;
}
} else {
ast_copy_string(tmp2, tmp, sizeof(tmp2));
}
if (strlen(tmp2) > 18) {
- ast_log(LOG_WARNING, "Truncating full name to 18 characters at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Truncating full name to 18 characters at line %d of %s\n", lineno, script);
tmp2[18] = '\0';
}
if (strlen(tmp) > 7) {
- ast_log(LOG_WARNING, "Truncating short name to 7 bytes at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Truncating short name to 7 bytes at line %d of %s\n", lineno, script);
tmp[7] = '\0';
}
/* Setup initial stuff */
@@ -1084,20 +1084,20 @@
} else if (!strcasecmp(keyword, "SUB")) {
args = get_token(&buf, script, lineno);
if (!args) {
- ast_log(LOG_WARNING, "SUB definition missing name at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "SUB definition missing name at line %d of %s\n", lineno, script);
break;
}
if (process_token(vname, args, sizeof(vname) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "'%s' is not a valid token for a KEY name at line %d of %s\n", args, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%s' is not a valid token for a KEY name at line %d of %s\n", args, lineno, script);
break;
}
state->sub = getsubbyname(state, vname, script, lineno);
if (!state->sub) {
- ast_log(LOG_WARNING, "Out of subroutine space at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Out of subroutine space at line %d of %s\n", lineno, script);
break;
}
if (state->sub->defined) {
- ast_log(LOG_WARNING, "Cannot redefine subroutine '%s' at line %d of %s\n", vname, lineno, script);
+ ast_log(NULL, LOG_WARNING, "Cannot redefine subroutine '%s' at line %d of %s\n", vname, lineno, script);
break;
}
/* Setup sub */
@@ -1115,37 +1115,37 @@
}
args = get_token(&buf, script, lineno);
if (!args || strcasecmp(args, "IS")) {
- ast_log(LOG_WARNING, "Expecting 'IS', but got '%s' at line %d of %s\n", args ? args : "<nothing>", lineno, script);
+ ast_log(NULL, LOG_WARNING, "Expecting 'IS', but got '%s' at line %d of %s\n", args ? args : "<nothing>", lineno, script);
break;
}
state->state = STATE_INSUB;
} else if (!strcasecmp(keyword, "STATE")) {
args = get_token(&buf, script, lineno);
if (!args) {
- ast_log(LOG_WARNING, "STATE definition missing name at line %d of %s\n", lineno, script);
+ ast_log(NULL, LOG_WARNING, "STATE definition missing name at line %d of %s\n", lineno, script);
break;
}
if (process_token(vname, args, sizeof(vname) - 1, ARG_STRING)) {
- ast_log(LOG_WARNING, "'%s' is not a valid token for a STATE name at line %d of %s\n", args, lineno, script);
+ ast_log(NULL, LOG_WARNING, "'%s' is not a valid token for a STATE name at line %d of %s\n", args, lineno, script);
break;
}
if (getstatebyname(state, vname, script, lineno, 0)) {
- ast_log(LOG_WARNING, "State '%s' is already defined at line %d of %s\n", vname, lineno, script);
[... 42447 lines stripped ...]
More information about the asterisk-commits
mailing list