[asterisk-commits] kpfleming: branch kpfleming/constify r195204 - in /team/kpfleming/constify: ....
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon May 18 10:30:03 CDT 2009
Author: kpfleming
Date: Mon May 18 10:29:44 2009
New Revision: 195204
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=195204
Log:
move this stuff to a branch so it can get some automerge goodness
Added:
team/kpfleming/constify/
- copied from r195182, trunk/
Modified:
team/kpfleming/constify/apps/app_adsiprog.c
team/kpfleming/constify/apps/app_alarmreceiver.c
team/kpfleming/constify/apps/app_amd.c
team/kpfleming/constify/apps/app_authenticate.c
team/kpfleming/constify/apps/app_cdr.c
team/kpfleming/constify/apps/app_chanisavail.c
team/kpfleming/constify/apps/app_channelredirect.c
team/kpfleming/constify/apps/app_chanspy.c
team/kpfleming/constify/apps/app_confbridge.c
team/kpfleming/constify/apps/app_controlplayback.c
team/kpfleming/constify/apps/app_dahdibarge.c
team/kpfleming/constify/apps/app_dahdiras.c
team/kpfleming/constify/apps/app_db.c
team/kpfleming/constify/apps/app_dial.c
team/kpfleming/constify/apps/app_dictate.c
team/kpfleming/constify/apps/app_directed_pickup.c
team/kpfleming/constify/apps/app_directory.c
team/kpfleming/constify/apps/app_disa.c
team/kpfleming/constify/apps/app_dumpchan.c
team/kpfleming/constify/apps/app_echo.c
team/kpfleming/constify/apps/app_exec.c
team/kpfleming/constify/apps/app_externalivr.c
team/kpfleming/constify/apps/app_fax.c
team/kpfleming/constify/apps/app_festival.c
team/kpfleming/constify/apps/app_flash.c
team/kpfleming/constify/apps/app_followme.c
team/kpfleming/constify/apps/app_forkcdr.c
team/kpfleming/constify/apps/app_getcpeid.c
team/kpfleming/constify/apps/app_ices.c
team/kpfleming/constify/apps/app_image.c
team/kpfleming/constify/apps/app_ivrdemo.c
team/kpfleming/constify/apps/app_jack.c
team/kpfleming/constify/apps/app_macro.c
team/kpfleming/constify/apps/app_meetme.c
team/kpfleming/constify/apps/app_milliwatt.c
team/kpfleming/constify/apps/app_minivm.c
team/kpfleming/constify/apps/app_mixmonitor.c
team/kpfleming/constify/apps/app_morsecode.c
team/kpfleming/constify/apps/app_mp3.c
team/kpfleming/constify/apps/app_nbscat.c
team/kpfleming/constify/apps/app_originate.c
team/kpfleming/constify/apps/app_osplookup.c
team/kpfleming/constify/apps/app_page.c
team/kpfleming/constify/apps/app_parkandannounce.c
team/kpfleming/constify/apps/app_playback.c
team/kpfleming/constify/apps/app_playtones.c
team/kpfleming/constify/apps/app_privacy.c
team/kpfleming/constify/apps/app_queue.c
team/kpfleming/constify/apps/app_read.c
team/kpfleming/constify/apps/app_readexten.c
team/kpfleming/constify/apps/app_readfile.c
team/kpfleming/constify/apps/app_record.c
team/kpfleming/constify/apps/app_rpt.c
team/kpfleming/constify/apps/app_sayunixtime.c
team/kpfleming/constify/apps/app_senddtmf.c
team/kpfleming/constify/apps/app_sendtext.c
team/kpfleming/constify/apps/app_setcallerid.c
team/kpfleming/constify/apps/app_skel.c
team/kpfleming/constify/apps/app_sms.c
team/kpfleming/constify/apps/app_softhangup.c
team/kpfleming/constify/apps/app_speech_utils.c
team/kpfleming/constify/apps/app_stack.c
team/kpfleming/constify/apps/app_system.c
team/kpfleming/constify/apps/app_talkdetect.c
team/kpfleming/constify/apps/app_test.c
team/kpfleming/constify/apps/app_transfer.c
team/kpfleming/constify/apps/app_url.c
team/kpfleming/constify/apps/app_userevent.c
team/kpfleming/constify/apps/app_verbose.c
team/kpfleming/constify/apps/app_voicemail.c
team/kpfleming/constify/apps/app_waitforring.c
team/kpfleming/constify/apps/app_waitforsilence.c
team/kpfleming/constify/apps/app_waituntil.c
team/kpfleming/constify/apps/app_while.c
team/kpfleming/constify/apps/app_zapateller.c
team/kpfleming/constify/cdr/cdr_adaptive_odbc.c
team/kpfleming/constify/cdr/cdr_sqlite.c
team/kpfleming/constify/cdr/cdr_sqlite3_custom.c
team/kpfleming/constify/channels/chan_agent.c
team/kpfleming/constify/channels/chan_alsa.c
team/kpfleming/constify/channels/chan_console.c
team/kpfleming/constify/channels/chan_dahdi.c
team/kpfleming/constify/channels/chan_iax2.c
team/kpfleming/constify/channels/chan_mgcp.c
team/kpfleming/constify/channels/chan_misdn.c
team/kpfleming/constify/channels/chan_nbs.c
team/kpfleming/constify/channels/chan_oss.c
team/kpfleming/constify/channels/chan_sip.c
team/kpfleming/constify/channels/chan_skinny.c
team/kpfleming/constify/channels/chan_unistim.c
team/kpfleming/constify/channels/console_gui.c
team/kpfleming/constify/channels/iax2-parser.c
team/kpfleming/constify/channels/misdn/chan_misdn_config.h
team/kpfleming/constify/channels/misdn_config.c
team/kpfleming/constify/channels/vcodecs.c
team/kpfleming/constify/formats/format_gsm.c
team/kpfleming/constify/funcs/func_devstate.c
team/kpfleming/constify/funcs/func_odbc.c
team/kpfleming/constify/funcs/func_strings.c
team/kpfleming/constify/include/asterisk/abstract_jb.h
team/kpfleming/constify/include/asterisk/agi.h
team/kpfleming/constify/include/asterisk/app.h
team/kpfleming/constify/include/asterisk/cli.h
team/kpfleming/constify/include/asterisk/extconf.h
team/kpfleming/constify/include/asterisk/features.h
team/kpfleming/constify/include/asterisk/image.h
team/kpfleming/constify/include/asterisk/module.h
team/kpfleming/constify/include/asterisk/pbx.h
team/kpfleming/constify/include/asterisk/speech.h
team/kpfleming/constify/include/asterisk/strings.h
team/kpfleming/constify/include/asterisk/taskprocessor.h
team/kpfleming/constify/include/asterisk/utils.h
team/kpfleming/constify/main/abstract_jb.c
team/kpfleming/constify/main/app.c
team/kpfleming/constify/main/ast_expr2.fl
team/kpfleming/constify/main/asterisk.c
team/kpfleming/constify/main/astobj2.c
team/kpfleming/constify/main/cdr.c
team/kpfleming/constify/main/channel.c
team/kpfleming/constify/main/cli.c
team/kpfleming/constify/main/dsp.c
team/kpfleming/constify/main/features.c
team/kpfleming/constify/main/frame.c
team/kpfleming/constify/main/image.c
team/kpfleming/constify/main/loader.c
team/kpfleming/constify/main/manager.c
team/kpfleming/constify/main/pbx.c
team/kpfleming/constify/main/taskprocessor.c
team/kpfleming/constify/main/udptl.c
team/kpfleming/constify/main/ulaw.c
team/kpfleming/constify/main/utils.c
team/kpfleming/constify/pbx/dundi-parser.c
team/kpfleming/constify/pbx/pbx_ael.c
team/kpfleming/constify/pbx/pbx_config.c
team/kpfleming/constify/res/res_agi.c
team/kpfleming/constify/res/res_clioriginate.c
team/kpfleming/constify/res/res_jabber.c
team/kpfleming/constify/res/res_limit.c
team/kpfleming/constify/res/res_monitor.c
team/kpfleming/constify/res/res_musiconhold.c
team/kpfleming/constify/res/res_odbc.c
team/kpfleming/constify/res/res_rtp_asterisk.c
team/kpfleming/constify/res/res_speech.c
team/kpfleming/constify/utils/conf2ael.c
team/kpfleming/constify/utils/extconf.c
Modified: team/kpfleming/constify/apps/app_adsiprog.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_adsiprog.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_adsiprog.c (original)
+++ team/kpfleming/constify/apps/app_adsiprog.c Mon May 18 10:29:44 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 void *data)
{
int res = 0;
Modified: team/kpfleming/constify/apps/app_alarmreceiver.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_alarmreceiver.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_alarmreceiver.c (original)
+++ team/kpfleming/constify/apps/app_alarmreceiver.c Mon May 18 10:29:44 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 void *data)
{
int res = 0;
event_node_t *elp, *efree;
Modified: team/kpfleming/constify/apps/app_amd.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_amd.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_amd.c (original)
+++ team/kpfleming/constify/apps/app_amd.c Mon May 18 10:29:44 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 void *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 void *data)
{
isAnsweringMachine(chan, data);
Modified: team/kpfleming/constify/apps/app_authenticate.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_authenticate.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_authenticate.c (original)
+++ team/kpfleming/constify/apps/app_authenticate.c Mon May 18 10:29:44 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 void *data)
{
int res = 0, retries, maxdigits;
char passwd[256], *prompt = "agent-pass", *argcopy = NULL;
Modified: team/kpfleming/constify/apps/app_cdr.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_cdr.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_cdr.c (original)
+++ team/kpfleming/constify/apps/app_cdr.c Mon May 18 10:29:44 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 void *data)
{
if (chan->cdr)
ast_set_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED);
Modified: team/kpfleming/constify/apps/app_chanisavail.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_chanisavail.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_chanisavail.c (original)
+++ team/kpfleming/constify/apps/app_chanisavail.c Mon May 18 10:29:44 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 void *data)
{
int inuse=-1, option_state=0, string_compare=0, option_all_avail=0;
int status;
Modified: team/kpfleming/constify/apps/app_channelredirect.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_channelredirect.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_channelredirect.c (original)
+++ team/kpfleming/constify/apps/app_channelredirect.c Mon May 18 10:29:44 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 void *data)
{
int res = -1;
char *info;
Modified: team/kpfleming/constify/apps/app_chanspy.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_chanspy.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_chanspy.c (original)
+++ team/kpfleming/constify/apps/app_chanspy.c Mon May 18 10:29:44 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 void *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 void *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 void *data)
{
const char *spec = "DAHDI";
struct ast_flags flags;
Modified: team/kpfleming/constify/apps/app_confbridge.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_confbridge.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_confbridge.c (original)
+++ team/kpfleming/constify/apps/app_confbridge.c Mon May 18 10:29:44 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 void *data)
{
int res = 0, volume_adjustments[2];
char *parse;
Modified: team/kpfleming/constify/apps/app_controlplayback.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_controlplayback.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_controlplayback.c (original)
+++ team/kpfleming/constify/apps/app_controlplayback.c Mon May 18 10:29:44 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 void *data)
{
int res = 0;
int skipms = 0;
Modified: team/kpfleming/constify/apps/app_dahdibarge.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_dahdibarge.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_dahdibarge.c (original)
+++ team/kpfleming/constify/apps/app_dahdibarge.c Mon May 18 10:29:44 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 void *data)
{
int res = -1;
int retrycnt = 0;
Modified: team/kpfleming/constify/apps/app_dahdiras.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_dahdiras.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_dahdiras.c (original)
+++ team/kpfleming/constify/apps/app_dahdiras.c Mon May 18 10:29:44 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 void *data)
{
int res=-1;
char *args;
Modified: team/kpfleming/constify/apps/app_db.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_db.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_db.c (original)
+++ team/kpfleming/constify/apps/app_db.c Mon May 18 10:29:44 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 void *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 void *data)
{
char *argv, *family, *key;
static int deprecation_warning = 0;
Modified: team/kpfleming/constify/apps/app_dial.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_dial.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_dial.c (original)
+++ team/kpfleming/constify/apps/app_dial.c Mon May 18 10:29:44 2009
@@ -1633,7 +1633,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 void *data, struct ast_flags64 *peerflags, int *continue_exec)
{
int res = -1; /* default: error */
char *rest, *cur; /* scan the list of destinations */
@@ -2422,7 +2422,7 @@
return res;
}
-static int dial_exec(struct ast_channel *chan, void *data)
+static int dial_exec(struct ast_channel *chan, const void *data)
{
struct ast_flags64 peerflags;
@@ -2431,7 +2431,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 void *data)
{
char *parse;
const char *context = NULL;
Modified: team/kpfleming/constify/apps/app_dictate.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_dictate.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_dictate.c (original)
+++ team/kpfleming/constify/apps/app_dictate.c Mon May 18 10:29:44 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 void *data)
{
char *path = NULL, filein[256], *filename = "";
char *parse;
Modified: team/kpfleming/constify/apps/app_directed_pickup.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_directed_pickup.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_directed_pickup.c (original)
+++ team/kpfleming/constify/apps/app_directed_pickup.c Mon May 18 10:29:44 2009
@@ -262,7 +262,7 @@
}
/* application entry point for Pickup() */
-static int pickup_exec(struct ast_channel *chan, void *data)
+static int pickup_exec(struct ast_channel *chan, const void *data)
{
int res = 0;
char *tmp = ast_strdupa(data);
@@ -291,7 +291,7 @@
}
/* application entry point for PickupChan() */
-static int pickupchan_exec(struct ast_channel *chan, void *data)
+static int pickupchan_exec(struct ast_channel *chan, const void *data)
{
int res = 0;
char *tmp = ast_strdupa(data);
Modified: team/kpfleming/constify/apps/app_directory.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_directory.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_directory.c (original)
+++ team/kpfleming/constify/apps/app_directory.c Mon May 18 10:29:44 2009
@@ -714,7 +714,7 @@
return res;
}
-static int directory_exec(struct ast_channel *chan, void *data)
+static int directory_exec(struct ast_channel *chan, const void *data)
{
int res = 0, digit = 3;
struct ast_config *cfg, *ucfg;
Modified: team/kpfleming/constify/apps/app_disa.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_disa.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_disa.c (original)
+++ team/kpfleming/constify/apps/app_disa.c Mon May 18 10:29:44 2009
@@ -140,7 +140,7 @@
}
}
-static int disa_exec(struct ast_channel *chan, void *data)
+static int disa_exec(struct ast_channel *chan, const void *data)
{
int i = 0, j, k = 0, did_ignore = 0, special_noanswer = 0;
int firstdigittimeout = (chan->pbx ? chan->pbx->rtimeoutms : 20000);
Modified: team/kpfleming/constify/apps/app_dumpchan.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_dumpchan.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_dumpchan.c (original)
+++ team/kpfleming/constify/apps/app_dumpchan.c Mon May 18 10:29:44 2009
@@ -147,7 +147,7 @@
return 0;
}
-static int dumpchan_exec(struct ast_channel *chan, void *data)
+static int dumpchan_exec(struct ast_channel *chan, const void *data)
{
struct ast_str *vars = ast_str_thread_get(&ast_str_thread_global_buf, 16);
char info[1024];
Modified: team/kpfleming/constify/apps/app_echo.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_echo.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_echo.c (original)
+++ team/kpfleming/constify/apps/app_echo.c Mon May 18 10:29:44 2009
@@ -48,7 +48,7 @@
static char *app = "Echo";
-static int echo_exec(struct ast_channel *chan, void *data)
+static int echo_exec(struct ast_channel *chan, const void *data)
{
int res = -1;
int format;
Modified: team/kpfleming/constify/apps/app_exec.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_exec.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_exec.c (original)
+++ team/kpfleming/constify/apps/app_exec.c Mon May 18 10:29:44 2009
@@ -129,7 +129,7 @@
static char *app_tryexec = "TryExec";
static char *app_execif = "ExecIf";
-static int exec_exec(struct ast_channel *chan, void *data)
+static int exec_exec(struct ast_channel *chan, const void *data)
{
int res = 0;
char *s, *appname, *endargs;
@@ -163,7 +163,7 @@
return res;
}
-static int tryexec_exec(struct ast_channel *chan, void *data)
+static int tryexec_exec(struct ast_channel *chan, const void *data)
{
int res = 0;
char *s, *appname, *endargs;
@@ -198,7 +198,7 @@
return 0;
}
-static int execif_exec(struct ast_channel *chan, void *data)
+static int execif_exec(struct ast_channel *chan, const void *data)
{
int res = 0;
char *truedata = NULL, *falsedata = NULL, *end, *firstcomma, *firstquestion;
Modified: team/kpfleming/constify/apps/app_externalivr.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_externalivr.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_externalivr.c (original)
+++ team/kpfleming/constify/apps/app_externalivr.c Mon May 18 10:29:44 2009
@@ -320,7 +320,7 @@
return entry;
}
-static int app_exec(struct ast_channel *chan, void *data)
+static int app_exec(struct ast_channel *chan, const void *data)
{
struct ast_flags flags = { 0, };
char *opts[0];
Modified: team/kpfleming/constify/apps/app_fax.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_fax.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_fax.c (original)
+++ team/kpfleming/constify/apps/app_fax.c Mon May 18 10:29:44 2009
@@ -705,7 +705,7 @@
/* === Application functions === */
-static int sndfax_exec(struct ast_channel *chan, void *data)
+static int sndfax_exec(struct ast_channel *chan, const void *data)
{
int res = 0;
char *parse;
@@ -749,7 +749,7 @@
return res;
}
-static int rcvfax_exec(struct ast_channel *chan, void *data)
+static int rcvfax_exec(struct ast_channel *chan, const void *data)
{
int res = 0;
char *parse;
Modified: team/kpfleming/constify/apps/app_festival.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_festival.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_festival.c (original)
+++ team/kpfleming/constify/apps/app_festival.c Mon May 18 10:29:44 2009
@@ -264,7 +264,7 @@
return res;
}
-static int festival_exec(struct ast_channel *chan, void *vdata)
+static int festival_exec(struct ast_channel *chan, const void *vdata)
{
int usecache;
int res = 0;
Modified: team/kpfleming/constify/apps/app_flash.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_flash.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_flash.c (original)
+++ team/kpfleming/constify/apps/app_flash.c Mon May 18 10:29:44 2009
@@ -72,7 +72,7 @@
return j;
}
-static int flash_exec(struct ast_channel *chan, void *data)
+static int flash_exec(struct ast_channel *chan, const void *data)
{
int res = -1;
int x;
Modified: team/kpfleming/constify/apps/app_followme.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_followme.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_followme.c (original)
+++ team/kpfleming/constify/apps/app_followme.c Mon May 18 10:29:44 2009
@@ -275,18 +275,19 @@
}
/*! \brief Add a new number */
-static struct number *create_followme_number(char *number, int timeout, int numorder)
+static struct number *create_followme_number(const char *number, int timeout, int numorder)
{
struct number *cur;
+ char *buf = ast_strdupa(number);
char *tmp;
if (!(cur = ast_calloc(1, sizeof(*cur))))
return NULL;
cur->timeout = timeout;
- if ((tmp = strchr(number, ',')))
+ if ((tmp = strchr(buf, ',')))
*tmp = '\0';
- ast_copy_string(cur->number, number, sizeof(cur->number));
+ ast_copy_string(cur->number, buf, sizeof(cur->number));
cur->order = numorder;
ast_debug(1, "Created a number, %s, order of , %d, with a timeout of %ld.\n", cur->number, cur->order, cur->timeout);
@@ -996,7 +997,7 @@
bconfig->end_bridge_callback_data = originator;
}
-static int app_exec(struct ast_channel *chan, void *data)
+static int app_exec(struct ast_channel *chan, const void *data)
{
struct fm_args targs = { 0, };
struct ast_bridge_config config;
Modified: team/kpfleming/constify/apps/app_forkcdr.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_forkcdr.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_forkcdr.c (original)
+++ team/kpfleming/constify/apps/app_forkcdr.c Mon May 18 10:29:44 2009
@@ -226,7 +226,7 @@
ast_set_flag(cdr, AST_CDR_FLAG_CHILD | AST_CDR_FLAG_LOCKED);
}
-static int forkcdr_exec(struct ast_channel *chan, void *data)
+static int forkcdr_exec(struct ast_channel *chan, const void *data)
{
int res = 0;
char *argcopy = NULL;
Modified: team/kpfleming/constify/apps/app_getcpeid.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/constify/apps/app_getcpeid.c?view=diff&rev=195204&r1=195182&r2=195204
==============================================================================
--- team/kpfleming/constify/apps/app_getcpeid.c (original)
+++ team/kpfleming/constify/apps/app_getcpeid.c Mon May 18 10:29:44 2009
@@ -61,7 +61,7 @@
return ast_adsi_print(chan, tmp, justify, voice);
}
-static int cpeid_exec(struct ast_channel *chan, void *idata)
+static int cpeid_exec(struct ast_channel *chan, const void *idata)
{
int res=0;
unsigned char cpeid[4];
Modified: team/kpfleming/constify/apps/app_ices.c
[... 5989 lines stripped ...]
More information about the asterisk-commits
mailing list