[asterisk-commits] phsultan: branch phsultan/jabberreceive r196620 - in /team/phsultan/jabberrec...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon May 25 12:58:55 CDT 2009
Author: phsultan
Date: Mon May 25 12:58:41 2009
New Revision: 196620
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196620
Log:
Merged revisions 196072,196114,196117,196187-196188,196227,196246,196268,196270,196272,196308,196344,196377,196381,196416-196417,196456,196488,196520,196554,196585 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r196072 | kpfleming | 2009-05-21 23:13:09 +0200 (Thu, 21 May 2009) | 16 lines
Const-ify the world (or at least a good part of it)
This patch adds 'const' tags to a number of Asterisk APIs where they are appropriate (where the API already demanded that the function argument not be modified, but the compiler was not informed of that fact). The list includes:
- CLI command handlers
- CLI command handler arguments
- AGI command handlers
- AGI command handler arguments
- Dialplan application handler arguments
- Speech engine API function arguments
In addition, various file-scope and function-scope constant arrays got 'const' and/or 'static' qualifiers where they were missing.
Review: https://reviewboard.asterisk.org/r/251/
................
r196114 | eliel | 2009-05-22 15:34:01 +0200 (Fri, 22 May 2009) | 5 lines
Avoid using prototypes when not necessary (it is already defined in the header
file).
Make log_match_char_tree() static to main/pbx.c (only used there).
................
r196117 | file | 2009-05-22 15:56:47 +0200 (Fri, 22 May 2009) | 12 lines
Merged revisions 196116 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r196116 | file | 2009-05-22 10:54:17 -0300 (Fri, 22 May 2009) | 5 lines
Fix a bug where using immediate with mISDN caused a cause code of 16 to get sent back instead of 1 if the 's' extension did not exist.
(closes issue #12286)
Reported by: lmamane
........
................
r196187 | rmudgett | 2009-05-22 17:07:21 +0200 (Fri, 22 May 2009) | 1 line
Make chan_misdn compile.
................
r196188 | rmudgett | 2009-05-22 17:07:48 +0200 (Fri, 22 May 2009) | 1 line
Fix constify the world compile problem.
................
r196227 | seanbright | 2009-05-22 18:10:33 +0200 (Fri, 22 May 2009) | 3 lines
Fix build under dev mode and remove some casts that are no longer necessary as
a result of the const-ify the world patch.
................
r196246 | russell | 2009-05-22 18:20:16 +0200 (Fri, 22 May 2009) | 1 line
resolve compiler warning
................
r196268 | mmichelson | 2009-05-22 18:50:31 +0200 (Fri, 22 May 2009) | 3 lines
s/it's/its/
................
r196270 | seanbright | 2009-05-22 18:51:22 +0200 (Fri, 22 May 2009) | 9 lines
Fix res_agi compilation after the const-ify the world merge.
Since we are dealing with a 'const char * const' now, we have to create a
temporary copy of the string to work on rather than the original. Fix inspired
by reporter. Reviewed by everyone-and-their-mother in #asterisk-dev.
(closes issue #15184)
Reported by: andrew
................
r196272 | tilghman | 2009-05-22 18:53:41 +0200 (Fri, 22 May 2009) | 2 lines
Two more minor fixes due to constification
................
r196308 | eliel | 2009-05-22 19:52:35 +0200 (Fri, 22 May 2009) | 30 lines
Implement a new element in AstXML for AMI actions documentation.
A new xml element was created to manage the AMI actions documentation,
using AstXML.
To register a manager action using XML documentation it is now possible
using ast_manager_register_xml().
The CLI command 'manager show command' can be used to show the parsed
documentation.
Example manager xml documentation:
<manager name="ami action name" language="en_US">
<synopsis>
AMI action synopsis.
</synopsis>
<syntax>
<xi:include xpointer="xpointer(...)" /> <-- for ActionID
<parameter name="header1" required="true">
<para>Description</para>
</parameter>
...
</syntax>
<description>
<para>AMI action description</para>
</description>
<see-also>
...
</see-also>
</manager>
................
r196344 | eliel | 2009-05-22 21:11:44 +0200 (Fri, 22 May 2009) | 6 lines
Moved static documentation to the AstXML form.
Moved AGI commands static documentation to XML docs ('say alpha', 'say digits',
'say number', 'say phonetic', 'say date' and 'say time').
................
r196377 | eliel | 2009-05-22 21:38:33 +0200 (Fri, 22 May 2009) | 11 lines
Unregister every registered application by MiniVM.
The MinivmMWI application was not being unregistered on unload and we were not
able to load again the module or reload it.
(closes issue #15174)
Reported by: junky
Patches:
unregister_minivm_mwi.diff uploaded by junky (license 177)
................
r196381 | seanbright | 2009-05-22 22:01:11 +0200 (Fri, 22 May 2009) | 3 lines
Don't crash if an RTP instance can't be created. This could occur when an
invalid bindaddr was specified in gtalk.conf.
................
r196416 | dvossel | 2009-05-22 23:09:45 +0200 (Fri, 22 May 2009) | 19 lines
SIP set outbound transport type from Registration
In sip.conf the transport option allows for the configuration of what transport types (udp, tcp, and tls) a peer will accept, but only the first type listed was used for outbound connections. This patch changes this. Now the default transport type is only used until the peer registers. When registration takes place the transport type is parsed out of the Contact header. If the Contact header's transport type is equal to one that the peer supports, the peer's default transport type for outbound connections is set to match the Contact header's type. If the Contact header's transport type is not present, then the peer's default transport type is set to match the one the peer registered with. When a peer unregisters or the registration expires, the default transport type for that peer is reset.
(closes issue #12282)
Reported by: rjain
Patches:
reg_patch_1.diff uploaded by dvossel (license 671)
Tested by: dvossel
(closes issue #14727)
Reported by: pj
Patches:
reg_patch_3.diff uploaded by dvossel (license 671)
Tested by: pj, dvossel
Review: https://reviewboard.asterisk.org/r/249/
................
r196417 | seanbright | 2009-05-22 23:11:03 +0200 (Fri, 22 May 2009) | 3 lines
Call ast_stun_init() when we're initializing to get the 'stun debug set'
commands.
................
r196456 | moy | 2009-05-23 06:27:47 +0200 (Sat, 23 May 2009) | 1 line
set MFCR2_CATEGORY just when starting the pbx
................
r196488 | kpfleming | 2009-05-23 15:31:56 +0200 (Sat, 23 May 2009) | 5 lines
Correct example for CLI autocompletion (generation)
Reported by Atis on #asterisk-dev
................
r196520 | seanbright | 2009-05-23 17:16:59 +0200 (Sat, 23 May 2009) | 11 lines
Fix errors in cdr_custom that cause reference errors when non-CDR variable
substitution is done.
cdr_custom was creating a ast_channel struct directly and passing it into the
core for variable substition. This was fine as long as the format string
contained only calls to the CDR() function. Doing something like ${EPOCH} on
the other hand tried to lock the channel, which would fail and throw an error
because the passed channel hadn't been allocated as an ao2 object. So now we
create the dummy channel with ast_channel_alloc, and everything works as
expected.
................
r196554 | eliel | 2009-05-23 23:11:31 +0200 (Sat, 23 May 2009) | 6 lines
Move static AGI commands documentation to XML.
Move AGI commands ('say datetime', 'send image', 'send text', 'set autohangup',
'set callerid', 'set context', 'set extension') documentation to the AstXML
form.
................
r196585 | eliel | 2009-05-24 18:17:31 +0200 (Sun, 24 May 2009) | 20 lines
Move AGI static documentation to the new AstXML form.
Move AGI commands documentation to XML docs:
'set priority'
'set variable'
'stream file'
'control stream file'
'tdd mode'
'verbose'
'wait for digit'
'speech create'
'speech set'
'speech destroy'
'speech load grammar'
'speech unload grammar'
'speech activate grammar'
'speech deactivate grammar'
'speech recognize'
................
Modified:
team/phsultan/jabberreceive/ (props changed)
team/phsultan/jabberreceive/apps/app_adsiprog.c
team/phsultan/jabberreceive/apps/app_alarmreceiver.c
team/phsultan/jabberreceive/apps/app_amd.c
team/phsultan/jabberreceive/apps/app_authenticate.c
team/phsultan/jabberreceive/apps/app_cdr.c
team/phsultan/jabberreceive/apps/app_chanisavail.c
team/phsultan/jabberreceive/apps/app_channelredirect.c
team/phsultan/jabberreceive/apps/app_chanspy.c
team/phsultan/jabberreceive/apps/app_confbridge.c
team/phsultan/jabberreceive/apps/app_controlplayback.c
team/phsultan/jabberreceive/apps/app_dahdibarge.c
team/phsultan/jabberreceive/apps/app_dahdiras.c
team/phsultan/jabberreceive/apps/app_db.c
team/phsultan/jabberreceive/apps/app_dial.c
team/phsultan/jabberreceive/apps/app_dictate.c
team/phsultan/jabberreceive/apps/app_directed_pickup.c
team/phsultan/jabberreceive/apps/app_directory.c
team/phsultan/jabberreceive/apps/app_disa.c
team/phsultan/jabberreceive/apps/app_dumpchan.c
team/phsultan/jabberreceive/apps/app_echo.c
team/phsultan/jabberreceive/apps/app_exec.c
team/phsultan/jabberreceive/apps/app_externalivr.c
team/phsultan/jabberreceive/apps/app_fax.c
team/phsultan/jabberreceive/apps/app_festival.c
team/phsultan/jabberreceive/apps/app_flash.c
team/phsultan/jabberreceive/apps/app_followme.c
team/phsultan/jabberreceive/apps/app_forkcdr.c
team/phsultan/jabberreceive/apps/app_getcpeid.c
team/phsultan/jabberreceive/apps/app_ices.c
team/phsultan/jabberreceive/apps/app_image.c
team/phsultan/jabberreceive/apps/app_ivrdemo.c
team/phsultan/jabberreceive/apps/app_jack.c
team/phsultan/jabberreceive/apps/app_macro.c
team/phsultan/jabberreceive/apps/app_meetme.c
team/phsultan/jabberreceive/apps/app_milliwatt.c
team/phsultan/jabberreceive/apps/app_minivm.c
team/phsultan/jabberreceive/apps/app_mixmonitor.c
team/phsultan/jabberreceive/apps/app_morsecode.c
team/phsultan/jabberreceive/apps/app_mp3.c
team/phsultan/jabberreceive/apps/app_nbscat.c
team/phsultan/jabberreceive/apps/app_originate.c
team/phsultan/jabberreceive/apps/app_osplookup.c
team/phsultan/jabberreceive/apps/app_page.c
team/phsultan/jabberreceive/apps/app_parkandannounce.c
team/phsultan/jabberreceive/apps/app_playback.c
team/phsultan/jabberreceive/apps/app_playtones.c
team/phsultan/jabberreceive/apps/app_privacy.c
team/phsultan/jabberreceive/apps/app_queue.c
team/phsultan/jabberreceive/apps/app_read.c
team/phsultan/jabberreceive/apps/app_readexten.c
team/phsultan/jabberreceive/apps/app_readfile.c
team/phsultan/jabberreceive/apps/app_record.c
team/phsultan/jabberreceive/apps/app_rpt.c
team/phsultan/jabberreceive/apps/app_sayunixtime.c
team/phsultan/jabberreceive/apps/app_senddtmf.c
team/phsultan/jabberreceive/apps/app_sendtext.c
team/phsultan/jabberreceive/apps/app_setcallerid.c
team/phsultan/jabberreceive/apps/app_skel.c
team/phsultan/jabberreceive/apps/app_sms.c
team/phsultan/jabberreceive/apps/app_softhangup.c
team/phsultan/jabberreceive/apps/app_speech_utils.c
team/phsultan/jabberreceive/apps/app_stack.c
team/phsultan/jabberreceive/apps/app_system.c
team/phsultan/jabberreceive/apps/app_talkdetect.c
team/phsultan/jabberreceive/apps/app_test.c
team/phsultan/jabberreceive/apps/app_transfer.c
team/phsultan/jabberreceive/apps/app_url.c
team/phsultan/jabberreceive/apps/app_userevent.c
team/phsultan/jabberreceive/apps/app_verbose.c
team/phsultan/jabberreceive/apps/app_voicemail.c
team/phsultan/jabberreceive/apps/app_waitforring.c
team/phsultan/jabberreceive/apps/app_waitforsilence.c
team/phsultan/jabberreceive/apps/app_waituntil.c
team/phsultan/jabberreceive/apps/app_while.c
team/phsultan/jabberreceive/apps/app_zapateller.c
team/phsultan/jabberreceive/cdr/cdr_adaptive_odbc.c
team/phsultan/jabberreceive/cdr/cdr_custom.c
team/phsultan/jabberreceive/cdr/cdr_sqlite.c
team/phsultan/jabberreceive/cdr/cdr_sqlite3_custom.c
team/phsultan/jabberreceive/channels/chan_agent.c
team/phsultan/jabberreceive/channels/chan_alsa.c
team/phsultan/jabberreceive/channels/chan_console.c
team/phsultan/jabberreceive/channels/chan_dahdi.c
team/phsultan/jabberreceive/channels/chan_gtalk.c
team/phsultan/jabberreceive/channels/chan_iax2.c
team/phsultan/jabberreceive/channels/chan_mgcp.c
team/phsultan/jabberreceive/channels/chan_misdn.c
team/phsultan/jabberreceive/channels/chan_nbs.c
team/phsultan/jabberreceive/channels/chan_oss.c
team/phsultan/jabberreceive/channels/chan_sip.c
team/phsultan/jabberreceive/channels/chan_skinny.c
team/phsultan/jabberreceive/channels/chan_unistim.c
team/phsultan/jabberreceive/channels/console_gui.c
team/phsultan/jabberreceive/channels/iax2-parser.c
team/phsultan/jabberreceive/channels/misdn/chan_misdn_config.h
team/phsultan/jabberreceive/channels/misdn_config.c
team/phsultan/jabberreceive/channels/vcodecs.c
team/phsultan/jabberreceive/configs/sip.conf.sample
team/phsultan/jabberreceive/doc/appdocsxml.dtd
team/phsultan/jabberreceive/formats/format_gsm.c
team/phsultan/jabberreceive/funcs/func_devstate.c
team/phsultan/jabberreceive/funcs/func_odbc.c
team/phsultan/jabberreceive/funcs/func_strings.c
team/phsultan/jabberreceive/include/asterisk/abstract_jb.h
team/phsultan/jabberreceive/include/asterisk/agi.h
team/phsultan/jabberreceive/include/asterisk/app.h
team/phsultan/jabberreceive/include/asterisk/cli.h
team/phsultan/jabberreceive/include/asterisk/extconf.h
team/phsultan/jabberreceive/include/asterisk/features.h
team/phsultan/jabberreceive/include/asterisk/image.h
team/phsultan/jabberreceive/include/asterisk/manager.h
team/phsultan/jabberreceive/include/asterisk/module.h
team/phsultan/jabberreceive/include/asterisk/pbx.h
team/phsultan/jabberreceive/include/asterisk/speech.h
team/phsultan/jabberreceive/include/asterisk/strings.h
team/phsultan/jabberreceive/include/asterisk/taskprocessor.h
team/phsultan/jabberreceive/include/asterisk/utils.h
team/phsultan/jabberreceive/include/asterisk/xmldoc.h
team/phsultan/jabberreceive/main/abstract_jb.c
team/phsultan/jabberreceive/main/app.c
team/phsultan/jabberreceive/main/ast_expr2.fl
team/phsultan/jabberreceive/main/asterisk.c
team/phsultan/jabberreceive/main/astmm.c
team/phsultan/jabberreceive/main/astobj2.c
team/phsultan/jabberreceive/main/cdr.c
team/phsultan/jabberreceive/main/channel.c
team/phsultan/jabberreceive/main/cli.c
team/phsultan/jabberreceive/main/db.c
team/phsultan/jabberreceive/main/dsp.c
team/phsultan/jabberreceive/main/features.c
team/phsultan/jabberreceive/main/frame.c
team/phsultan/jabberreceive/main/image.c
team/phsultan/jabberreceive/main/loader.c
team/phsultan/jabberreceive/main/manager.c
team/phsultan/jabberreceive/main/pbx.c
team/phsultan/jabberreceive/main/taskprocessor.c
team/phsultan/jabberreceive/main/udptl.c
team/phsultan/jabberreceive/main/ulaw.c
team/phsultan/jabberreceive/main/utils.c
team/phsultan/jabberreceive/main/xmldoc.c
team/phsultan/jabberreceive/pbx/dundi-parser.c
team/phsultan/jabberreceive/pbx/pbx_ael.c
team/phsultan/jabberreceive/pbx/pbx_config.c
team/phsultan/jabberreceive/res/res_agi.c
team/phsultan/jabberreceive/res/res_clioriginate.c
team/phsultan/jabberreceive/res/res_jabber.c
team/phsultan/jabberreceive/res/res_limit.c
team/phsultan/jabberreceive/res/res_monitor.c
team/phsultan/jabberreceive/res/res_musiconhold.c
team/phsultan/jabberreceive/res/res_odbc.c
team/phsultan/jabberreceive/res/res_rtp_asterisk.c
team/phsultan/jabberreceive/res/res_speech.c
team/phsultan/jabberreceive/utils/conf2ael.c
team/phsultan/jabberreceive/utils/extconf.c
Propchange: team/phsultan/jabberreceive/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/phsultan/jabberreceive/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon May 25 12:58:41 2009
@@ -1,1 +1,1 @@
-/trunk:1-196051
+/trunk:1-196619
Modified: team/phsultan/jabberreceive/apps/app_adsiprog.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_adsiprog.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_adsiprog.c (original)
+++ team/phsultan/jabberreceive/apps/app_adsiprog.c Mon May 25 12:58:41 2009
@@ -74,7 +74,7 @@
char *name;
};
-static struct adsi_event events[] = {
+static const struct adsi_event events[] = {
{ 1, "CALLERID" },
{ 2, "VMWI" },
{ 3, "NEARANSWER" },
@@ -101,7 +101,7 @@
{ 24, "CPEID" },
};
-static struct adsi_event justify[] = {
+static const struct adsi_event justify[] = {
{ 0, "CENTER" },
{ 1, "RIGHT" },
{ 2, "LEFT" },
@@ -232,7 +232,7 @@
return 0;
}
-static char *get_token(char **buf, char *script, int lineno)
+static char *get_token(char **buf, const char *script, int lineno)
{
char *tmp = *buf, *keyword;
int quoted = 0;
@@ -264,7 +264,7 @@
static char *validdtmf = "123456789*0#ABCD";
-static int send_dtmf(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int send_dtmf(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
{
char dtmfstr[80], *a;
int bytes = 0;
@@ -294,7 +294,7 @@
return bytes;
}
-static int goto_line(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int goto_line(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
{
char *page = get_token(&args, script, lineno);
char *gline = get_token(&args, script, lineno);
@@ -327,7 +327,7 @@
return 2;
}
-static int goto_line_rel(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int goto_line_rel(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
{
char *dir = get_token(&args, script, lineno);
char *gline = get_token(&args, script, lineno);
@@ -360,7 +360,7 @@
return 2;
}
-static int send_delay(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int send_delay(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
{
char *gtime = get_token(&args, script, lineno);
int ms;
@@ -385,7 +385,7 @@
return 2;
}
-static int set_state(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int set_state(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
{
char *gstate = get_token(&args, script, lineno);
int state;
@@ -406,7 +406,7 @@
return 2;
}
-static int cleartimer(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int cleartimer(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
@@ -424,7 +424,7 @@
return 2;
}
-static struct adsi_flag *getflagbyname(struct adsi_script *state, char *name, char *script, int lineno, int create)
+static struct adsi_flag *getflagbyname(struct adsi_script *state, char *name, const char *script, int lineno, int create)
{
int x;
@@ -449,7 +449,7 @@
return &state->flags[state->numflags-1];
}
-static int setflag(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int setflag(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
char sname[80];
@@ -476,7 +476,7 @@
return 2;
}
-static int clearflag(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int clearflag(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
struct adsi_flag *flag;
@@ -503,7 +503,7 @@
return 2;
}
-static int starttimer(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int starttimer(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
int secs;
@@ -549,7 +549,7 @@
return -1;
}
-static struct adsi_soft_key *getkeybyname(struct adsi_script *state, char *name, char *script, int lineno)
+static struct adsi_soft_key *getkeybyname(struct adsi_script *state, char *name, const char *script, int lineno)
{
int x;
@@ -570,7 +570,7 @@
return &state->keys[state->numkeys-1];
}
-static struct adsi_subscript *getsubbyname(struct adsi_script *state, char *name, char *script, int lineno)
+static struct adsi_subscript *getsubbyname(struct adsi_script *state, char *name, const char *script, int lineno)
{
int x;
@@ -591,7 +591,7 @@
return &state->subs[state->numsubs-1];
}
-static struct adsi_state *getstatebyname(struct adsi_script *state, char *name, char *script, int lineno, int create)
+static struct adsi_state *getstatebyname(struct adsi_script *state, char *name, const char *script, int lineno, int create)
{
int x;
@@ -616,7 +616,7 @@
return &state->states[state->numstates-1];
}
-static struct adsi_display *getdisplaybyname(struct adsi_script *state, char *name, char *script, int lineno, int create)
+static struct adsi_display *getdisplaybyname(struct adsi_script *state, char *name, const char *script, int lineno, int create)
{
int x;
@@ -641,7 +641,7 @@
return &state->displays[state->numdisplays-1];
}
-static int showkeys(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int showkeys(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
{
char *tok, newkey[80];
int bytes, x, flagid = 0;
@@ -688,7 +688,7 @@
return 2 + x;
}
-static int showdisplay(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int showdisplay(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
{
char *tok, dispname[80];
int line = 0, flag = 0, cmd = 3;
@@ -739,7 +739,7 @@
return 3;
}
-static int cleardisplay(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int cleardisplay(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
@@ -751,7 +751,7 @@
return 2;
}
-static int digitdirect(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int digitdirect(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
@@ -763,7 +763,7 @@
return 2;
}
-static int clearcbone(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int clearcbone(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
@@ -775,7 +775,7 @@
return 2;
}
-static int digitcollect(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int digitcollect(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
@@ -787,7 +787,7 @@
return 2;
}
-static int subscript(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int subscript(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
char subscr[80];
@@ -812,7 +812,7 @@
return 2;
}
-static int onevent(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int onevent(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
char subscr[80], sname[80];
@@ -879,10 +879,10 @@
struct adsi_key_cmd {
char *name;
int id;
- int (*add_args)(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno);
+ int (*add_args)(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno);
};
-static struct adsi_key_cmd kcmds[] = {
+static const struct adsi_key_cmd kcmds[] = {
{ "SENDDTMF", 0, send_dtmf },
/* Encoded DTMF would go here */
{ "ONHOOK", 0x81 },
@@ -924,7 +924,7 @@
{ "EXIT", 0xa0 },
};
-static struct adsi_key_cmd opcmds[] = {
+static const struct adsi_key_cmd opcmds[] = {
/* 1 - Branch on event -- handled specially */
{ "SHOWKEYS", 2, showkeys },
@@ -944,7 +944,7 @@
};
-static int process_returncode(struct adsi_soft_key *key, char *code, char *args, struct adsi_script *state, char *script, int lineno)
+static int process_returncode(struct adsi_soft_key *key, char *code, char *args, struct adsi_script *state, const char *script, int lineno)
{
int x, res;
char *unused;
@@ -973,7 +973,7 @@
return -1;
}
-static int process_opcode(struct adsi_subscript *sub, char *code, char *args, struct adsi_script *state, char *script, int lineno)
+static int process_opcode(struct adsi_subscript *sub, char *code, char *args, struct adsi_script *state, const char *script, int lineno)
{
int x, res, max = sub->id ? MAX_SUB_LEN : MAX_MAIN_LEN;
char *unused;
@@ -1010,7 +1010,7 @@
return -1;
}
-static int adsi_process(struct adsi_script *state, char *buf, char *script, int lineno)
+static int adsi_process(struct adsi_script *state, char *buf, const char *script, int lineno)
{
char *keyword = get_token(&buf, script, lineno);
char *args, vname[256], tmp[80], tmp2[80];
@@ -1358,7 +1358,7 @@
return 0;
}
-static struct adsi_script *compile_script(char *script)
+static struct adsi_script *compile_script(const char *script)
{
FILE *f;
char fn[256], buf[256], *c;
@@ -1451,7 +1451,7 @@
}
#endif
-static int adsi_prog(struct ast_channel *chan, char *script)
+static int adsi_prog(struct ast_channel *chan, const char *script)
{
struct adsi_script *scr;
int x, bytes;
@@ -1562,7 +1562,7 @@
return 0;
}
-static int adsi_exec(struct ast_channel *chan, void *data)
+static int adsi_exec(struct ast_channel *chan, const char *data)
{
int res = 0;
Modified: team/phsultan/jabberreceive/apps/app_alarmreceiver.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_alarmreceiver.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_alarmreceiver.c (original)
+++ team/phsultan/jabberreceive/apps/app_alarmreceiver.c Mon May 25 12:58:41 2009
@@ -416,7 +416,7 @@
*
* The function will return 0 when the caller hangs up, else a -1 if there was a problem.
*/
-static int receive_ademco_contact_id( struct ast_channel *chan, void *data, int fdto, int sdto, int tldn, event_node_t **ehead)
+static int receive_ademco_contact_id(struct ast_channel *chan, const void *data, int fdto, int sdto, int tldn, event_node_t **ehead)
{
int i, j;
int res = 0;
@@ -564,7 +564,7 @@
* This is the main function called by Asterisk Core whenever the App is invoked in the extension logic.
* This function will always return 0.
*/
-static int alarmreceiver_exec(struct ast_channel *chan, void *data)
+static int alarmreceiver_exec(struct ast_channel *chan, const char *data)
{
int res = 0;
event_node_t *elp, *efree;
Modified: team/phsultan/jabberreceive/apps/app_amd.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_amd.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_amd.c (original)
+++ team/phsultan/jabberreceive/apps/app_amd.c Mon May 25 12:58:41 2009
@@ -143,7 +143,7 @@
/* Set to the lowest ms value provided in amd.conf or application parameters */
static int dfltMaxWaitTimeForFrame = 50;
-static void isAnsweringMachine(struct ast_channel *chan, void *data)
+static void isAnsweringMachine(struct ast_channel *chan, const char *data)
{
int res = 0;
struct ast_frame *f = NULL;
@@ -404,7 +404,7 @@
}
-static int amd_exec(struct ast_channel *chan, void *data)
+static int amd_exec(struct ast_channel *chan, const char *data)
{
isAnsweringMachine(chan, data);
Modified: team/phsultan/jabberreceive/apps/app_authenticate.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_authenticate.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_authenticate.c (original)
+++ team/phsultan/jabberreceive/apps/app_authenticate.c Mon May 25 12:58:41 2009
@@ -105,7 +105,7 @@
</application>
***/
-static int auth_exec(struct ast_channel *chan, void *data)
+static int auth_exec(struct ast_channel *chan, const char *data)
{
int res = 0, retries, maxdigits;
char passwd[256], *prompt = "agent-pass", *argcopy = NULL;
Modified: team/phsultan/jabberreceive/apps/app_cdr.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_cdr.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_cdr.c (original)
+++ team/phsultan/jabberreceive/apps/app_cdr.c Mon May 25 12:58:41 2009
@@ -44,9 +44,9 @@
</application>
***/
-static char *nocdr_app = "NoCDR";
+static const char nocdr_app[] = "NoCDR";
-static int nocdr_exec(struct ast_channel *chan, void *data)
+static int nocdr_exec(struct ast_channel *chan, const char *data)
{
if (chan->cdr)
ast_set_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED);
Modified: team/phsultan/jabberreceive/apps/app_chanisavail.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_chanisavail.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_chanisavail.c (original)
+++ team/phsultan/jabberreceive/apps/app_chanisavail.c Mon May 25 12:58:41 2009
@@ -92,7 +92,7 @@
</application>
***/
-static int chanavail_exec(struct ast_channel *chan, void *data)
+static int chanavail_exec(struct ast_channel *chan, const char *data)
{
int inuse=-1, option_state=0, string_compare=0, option_all_avail=0;
int status;
Modified: team/phsultan/jabberreceive/apps/app_channelredirect.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_channelredirect.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_channelredirect.c (original)
+++ team/phsultan/jabberreceive/apps/app_channelredirect.c Mon May 25 12:58:41 2009
@@ -62,7 +62,7 @@
***/
static char *app = "ChannelRedirect";
-static int asyncgoto_exec(struct ast_channel *chan, void *data)
+static int asyncgoto_exec(struct ast_channel *chan, const char *data)
{
int res = -1;
char *info;
Modified: team/phsultan/jabberreceive/apps/app_chanspy.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_chanspy.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_chanspy.c (original)
+++ team/phsultan/jabberreceive/apps/app_chanspy.c Mon May 25 12:58:41 2009
@@ -963,7 +963,7 @@
return res;
}
-static int chanspy_exec(struct ast_channel *chan, void *data)
+static int chanspy_exec(struct ast_channel *chan, const char *data)
{
char *myenforced = NULL;
char *mygroup = NULL;
@@ -985,9 +985,9 @@
AST_APP_ARG(options);
);
char *opts[OPT_ARG_ARRAY_SIZE];
-
- data = ast_strdupa(data);
- AST_STANDARD_APP_ARGS(args, data);
+ char *parse = ast_strdupa(data);
+
+ AST_STANDARD_APP_ARGS(args, parse);
if (args.spec && !strcmp(args.spec, "all"))
args.spec = NULL;
@@ -1078,7 +1078,7 @@
return res;
}
-static int extenspy_exec(struct ast_channel *chan, void *data)
+static int extenspy_exec(struct ast_channel *chan, const char *data)
{
char *ptr, *exten = NULL;
char *mygroup = NULL;
@@ -1099,10 +1099,9 @@
AST_APP_ARG(context);
AST_APP_ARG(options);
);
-
- data = ast_strdupa(data);
-
- AST_STANDARD_APP_ARGS(args, data);
+ char *parse = ast_strdupa(data);
+
+ AST_STANDARD_APP_ARGS(args, parse);
if (!ast_strlen_zero(args.context) && (ptr = strchr(args.context, '@'))) {
exten = args.context;
*ptr++ = '\0';
@@ -1199,7 +1198,7 @@
return res;
}
-static int dahdiscan_exec(struct ast_channel *chan, void *data)
+static int dahdiscan_exec(struct ast_channel *chan, const char *data)
{
const char *spec = "DAHDI";
struct ast_flags flags;
Modified: team/phsultan/jabberreceive/apps/app_confbridge.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_confbridge.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_confbridge.c (original)
+++ team/phsultan/jabberreceive/apps/app_confbridge.c Mon May 25 12:58:41 2009
@@ -683,7 +683,7 @@
}
/*! \brief The ConfBridge application */
-static int confbridge_exec(struct ast_channel *chan, void *data)
+static int confbridge_exec(struct ast_channel *chan, const char *data)
{
int res = 0, volume_adjustments[2];
char *parse;
Modified: team/phsultan/jabberreceive/apps/app_controlplayback.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_controlplayback.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_controlplayback.c (original)
+++ team/phsultan/jabberreceive/apps/app_controlplayback.c Mon May 25 12:58:41 2009
@@ -125,7 +125,7 @@
return 0;
}
-static int controlplayback_exec(struct ast_channel *chan, void *data)
+static int controlplayback_exec(struct ast_channel *chan, const char *data)
{
int res = 0;
int skipms = 0;
Modified: team/phsultan/jabberreceive/apps/app_dahdibarge.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_dahdibarge.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_dahdibarge.c (original)
+++ team/phsultan/jabberreceive/apps/app_dahdibarge.c Mon May 25 12:58:41 2009
@@ -258,7 +258,7 @@
return ret;
}
-static int conf_exec(struct ast_channel *chan, void *data)
+static int conf_exec(struct ast_channel *chan, const char *data)
{
int res = -1;
int retrycnt = 0;
Modified: team/phsultan/jabberreceive/apps/app_dahdiras.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_dahdiras.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_dahdiras.c (original)
+++ team/phsultan/jabberreceive/apps/app_dahdiras.c Mon May 25 12:58:41 2009
@@ -187,7 +187,7 @@
ast_safe_fork_cleanup();
}
-static int dahdiras_exec(struct ast_channel *chan, void *data)
+static int dahdiras_exec(struct ast_channel *chan, const char *data)
{
int res=-1;
char *args;
Modified: team/phsultan/jabberreceive/apps/app_db.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_db.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_db.c (original)
+++ team/phsultan/jabberreceive/apps/app_db.c Mon May 25 12:58:41 2009
@@ -83,7 +83,7 @@
static char *d_app = "DBdel";
static char *dt_app = "DBdeltree";
-static int deltree_exec(struct ast_channel *chan, void *data)
+static int deltree_exec(struct ast_channel *chan, const char *data)
{
char *argv, *family, *keytree;
@@ -114,7 +114,7 @@
return 0;
}
-static int del_exec(struct ast_channel *chan, void *data)
+static int del_exec(struct ast_channel *chan, const char *data)
{
char *argv, *family, *key;
static int deprecation_warning = 0;
Modified: team/phsultan/jabberreceive/apps/app_dial.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_dial.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_dial.c (original)
+++ team/phsultan/jabberreceive/apps/app_dial.c Mon May 25 12:58:41 2009
@@ -1634,7 +1634,7 @@
bconfig->end_bridge_callback_data = originator;
}
-static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags64 *peerflags, int *continue_exec)
+static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast_flags64 *peerflags, int *continue_exec)
{
int res = -1; /* default: error */
char *rest, *cur; /* scan the list of destinations */
@@ -2423,7 +2423,7 @@
return res;
}
-static int dial_exec(struct ast_channel *chan, void *data)
+static int dial_exec(struct ast_channel *chan, const char *data)
{
struct ast_flags64 peerflags;
@@ -2432,7 +2432,7 @@
return dial_exec_full(chan, data, &peerflags, NULL);
}
-static int retrydial_exec(struct ast_channel *chan, void *data)
+static int retrydial_exec(struct ast_channel *chan, const char *data)
{
char *parse;
const char *context = NULL;
Modified: team/phsultan/jabberreceive/apps/app_dictate.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_dictate.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_dictate.c (original)
+++ team/phsultan/jabberreceive/apps/app_dictate.c Mon May 25 12:58:41 2009
@@ -81,7 +81,7 @@
return res;
}
-static int dictate_exec(struct ast_channel *chan, void *data)
+static int dictate_exec(struct ast_channel *chan, const char *data)
{
char *path = NULL, filein[256], *filename = "";
char *parse;
Modified: team/phsultan/jabberreceive/apps/app_directed_pickup.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/phsultan/jabberreceive/apps/app_directed_pickup.c?view=diff&rev=196620&r1=196619&r2=196620
==============================================================================
--- team/phsultan/jabberreceive/apps/app_directed_pickup.c (original)
+++ team/phsultan/jabberreceive/apps/app_directed_pickup.c Mon May 25 12:58:41 2009
@@ -262,7 +262,7 @@
}
[... 9608 lines stripped ...]
More information about the asterisk-commits
mailing list