[svn-commits] branch russell/make_output - r8218 in
/team/russell/make_output: ./ apps/ cha...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Jan 18 16:24:18 MST 2006
Author: russell
Date: Wed Jan 18 17:24:08 2006
New Revision: 8218
URL: http://svn.digium.com/view/asterisk?rev=8218&view=rev
Log:
Merged revisions 8099-8105,8113-8114,8118,8120,8123,8125,8127,8133,8135-8138,8141,8148,8150,8152-8153,8155-8157,8161,8163,8179,8186,8190,8195,8203 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r8099 | bweschke | 2006-01-16 12:31:30 -0500 (Mon, 16 Jan 2006) | 3 lines
More code optimization with the new argument macros #6253
................
r8100 | bweschke | 2006-01-16 12:37:44 -0500 (Mon, 16 Jan 2006) | 3 lines
Spelling corrections (mostly in comments and doxygen areas) #6249
................
r8101 | russell | 2006-01-16 12:51:35 -0500 (Mon, 16 Jan 2006) | 2 lines
remove redundant CFLAGS for BSD which are already set in the main Makefile (issue #6250)
................
r8102 | tilghman | 2006-01-16 13:05:19 -0500 (Mon, 16 Jan 2006) | 2 lines
Bug 5090 - sample configuration for udptl packets
................
r8103 | tilghman | 2006-01-16 13:39:01 -0500 (Mon, 16 Jan 2006) | 2 lines
Change a debugging message committed with the wrong level
................
r8104 | tilghman | 2006-01-16 13:41:18 -0500 (Mon, 16 Jan 2006) | 2 lines
Argh, another ERROR that should have been DEBUG
................
r8105 | jdixon | 2006-01-16 13:52:13 -0500 (Mon, 16 Jan 2006) | 3 lines
Added NOANSWER support, so that optional the DISA application starts without
answering (used in new version of app_rpt, and potentially other applicaitons).
................
r8113 | kpfleming | 2006-01-16 18:52:02 -0500 (Mon, 16 Jan 2006) | 2 lines
block this revision, fix is different in this branch
................
r8114 | kpfleming | 2006-01-16 18:52:51 -0500 (Mon, 16 Jan 2006) | 2 lines
check rlimit _after_ reading config file, so that if 'dumpcore' is specified there it will take effect
................
r8118 | oej | 2006-01-16 22:05:43 -0500 (Mon, 16 Jan 2006) | 2 lines
Doxygen update
................
r8120 | kpfleming | 2006-01-17 00:15:33 -0500 (Tue, 17 Jan 2006) | 2 lines
don't generate any message for native bridge attempts unless all the basic checks have passed and we're actually going to try it
................
r8123 | kpfleming | 2006-01-17 08:13:31 -0500 (Tue, 17 Jan 2006) | 10 lines
Merged revisions 8122 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8122 | kpfleming | 2006-01-17 07:11:55 -0600 (Tue, 17 Jan 2006) | 2 lines
update CLI copyright notice
........
................
r8125 | mogorman | 2006-01-17 11:58:09 -0500 (Tue, 17 Jan 2006) | 10 lines
Merged revisions 7963 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r7963 | mogorman | 2006-01-10 22:38:07 -0600 (Tue, 10 Jan 2006) | 2 lines
Minor typo refrenced in 6191
........
................
r8127 | mogorman | 2006-01-17 12:25:53 -0500 (Tue, 17 Jan 2006) | 2 lines
Added tab completion for help. bug 6074
................
r8133 | mattf | 2006-01-17 13:20:33 -0500 (Tue, 17 Jan 2006) | 2 lines
Check to see if arg is NULL before passing (#6094)
................
r8135 | bweschke | 2006-01-17 13:31:03 -0500 (Tue, 17 Jan 2006) | 3 lines
Fix compiler warning.
................
r8136 | oej | 2006-01-17 13:54:56 -0500 (Tue, 17 Jan 2006) | 3 lines
- Logging clean up
- Whitespace removed and added, formatting fixed
................
r8137 | oej | 2006-01-17 13:56:57 -0500 (Tue, 17 Jan 2006) | 2 lines
Extra comma causing compilation errors...
................
r8138 | oej | 2006-01-17 14:03:04 -0500 (Tue, 17 Jan 2006) | 2 lines
Portability - compilation warning on Mac OS/X removed
................
r8141 | mogorman | 2006-01-17 15:16:18 -0500 (Tue, 17 Jan 2006) | 11 lines
Merged revisions 8140 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r8140 | mogorman | 2006-01-17 14:10:29 -0600 (Tue, 17 Jan 2006) | 3 lines
Stop any generators running on a channel when
festival is called as described in 5996
........
................
r8148 | kpfleming | 2006-01-17 15:49:39 -0500 (Tue, 17 Jan 2006) | 2 lines
suppress compiler warning
................
r8150 | kpfleming | 2006-01-17 15:53:04 -0500 (Tue, 17 Jan 2006) | 2 lines
spelling fix
................
r8152 | mogorman | 2006-01-17 15:58:56 -0500 (Tue, 17 Jan 2006) | 3 lines
allow for multiple periodic announcements
from bug 5273 with minor changes.
................
r8153 | mogorman | 2006-01-17 16:10:38 -0500 (Tue, 17 Jan 2006) | 2 lines
oops all better now.
................
r8155 | mattf | 2006-01-17 18:13:42 -0500 (Tue, 17 Jan 2006) | 2 lines
Fix answeronpolarityswitch and hanguponpolarityswitch when both are yes (#6229)
................
r8156 | mattf | 2006-01-17 18:37:22 -0500 (Tue, 17 Jan 2006) | 2 lines
Improvements to DSP callprogress=yes code (#5009)
................
r8157 | kpfleming | 2006-01-17 18:45:05 -0500 (Tue, 17 Jan 2006) | 2 lines
remove some more deprecated (pre-1.2) stuff
................
r8161 | mogorman | 2006-01-17 19:05:09 -0500 (Tue, 17 Jan 2006) | 3 lines
cleanup the show uptime code, and minor changes
to patch 6274
................
r8163 | mogorman | 2006-01-17 19:49:43 -0500 (Tue, 17 Jan 2006) | 12 lines
Merged revisions 8162 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8162 | mogorman | 2006-01-17 18:47:04 -0600 (Tue, 17 Jan 2006) | 4 lines
Changed order of autoload so that pbx_ comes before
channels, and in doing so cause bug 6002 to not
be an issue
........
................
r8179 | mogorman | 2006-01-17 22:53:10 -0500 (Tue, 17 Jan 2006) | 3 lines
cli.h cleanup and additional documentation
from patch 6272
................
r8186 | mogorman | 2006-01-18 10:42:48 -0500 (Wed, 18 Jan 2006) | 3 lines
allows for use of the originate function from
the cli patch 5847
................
r8190 | mogorman | 2006-01-18 11:24:29 -0500 (Wed, 18 Jan 2006) | 2 lines
oops. sorry
................
r8195 | mogorman | 2006-01-18 16:12:14 -0500 (Wed, 18 Jan 2006) | 11 lines
Merged revisions 8194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8194 | mogorman | 2006-01-18 15:02:06 -0600 (Wed, 18 Jan 2006) | 3 lines
Solves issue with the login proccess in meetme
patch from 6136
........
................
r8203 | russell | 2006-01-18 17:17:31 -0500 (Wed, 18 Jan 2006) | 2 lines
constify arguments in more places where strings should not be modified (issue #6286)
................
Added:
team/russell/make_output/configs/udptl.conf.sample
- copied unchanged from r8203, trunk/configs/udptl.conf.sample
team/russell/make_output/res/res_clioriginate.c
- copied unchanged from r8203, trunk/res/res_clioriginate.c
Modified:
team/russell/make_output/ (props changed)
team/russell/make_output/Makefile
team/russell/make_output/apps/app_meetme.c
team/russell/make_output/apps/app_queue.c
team/russell/make_output/apps/app_voicemail.c
team/russell/make_output/asterisk.c
team/russell/make_output/channels/chan_agent.c
team/russell/make_output/channels/chan_iax2.c
team/russell/make_output/channels/chan_oss.c
team/russell/make_output/channels/chan_sip.c
team/russell/make_output/channels/iax2-provision.c
team/russell/make_output/channels/iax2-provision.h
team/russell/make_output/cli.c
team/russell/make_output/codecs/Makefile
team/russell/make_output/formats/Makefile
team/russell/make_output/include/asterisk/cli.h
team/russell/make_output/include/asterisk/module.h
team/russell/make_output/loader.c
team/russell/make_output/manager.c
team/russell/make_output/pbx.c
team/russell/make_output/pbx/pbx_config.c
team/russell/make_output/pbx/pbx_dundi.c
team/russell/make_output/res/Makefile
team/russell/make_output/res/res_features.c
team/russell/make_output/utils/Makefile
Propchange: team/russell/make_output/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Wed Jan 18 17:24:08 2006
@@ -1,1 +1,1 @@
-/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047
+/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047,8112
Propchange: team/russell/make_output/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 18 17:24:08 2006
@@ -1,1 +1,1 @@
-/trunk:1-8091
+/trunk:1-8215
Modified: team/russell/make_output/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/Makefile?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/Makefile (original)
+++ team/russell/make_output/Makefile Wed Jan 18 17:24:08 2006
@@ -531,9 +531,8 @@
mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
fi
$(CMDPREFIX)rm -f include/asterisk/build.h.tmp
- $(CMDPREFIX)$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
- @echo "-=-=- Linking Asterisk Executable -=-=-"
- $(CMDPREFIX)$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
+ $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
+ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
muted: muted.o
$(CC) $(AUDIO_LIBS) -o muted muted.o
Modified: team/russell/make_output/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/apps/app_meetme.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/apps/app_meetme.c (original)
+++ team/russell/make_output/apps/app_meetme.c Wed Jan 18 17:24:08 2006
@@ -688,7 +688,7 @@
return 0;
}
-static char *complete_confcmd(char *line, char *word, int pos, int state) {
+static char *complete_confcmd(const char *line, const char *word, int pos, int state) {
#define CONF_COMMANDS 6
int which = 0, x = 0;
struct ast_conference *cnf = NULL;
Modified: team/russell/make_output/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/apps/app_queue.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/apps/app_queue.c (original)
+++ team/russell/make_output/apps/app_queue.c Wed Jan 18 17:24:08 2006
@@ -3503,7 +3503,7 @@
return __queues_show(0, fd, argc, argv, 1);
}
-static char *complete_queue(char *line, char *word, int pos, int state)
+static char *complete_queue(const char *line, const char *word, int pos, int state)
{
struct ast_call_queue *q;
char *ret = NULL;
@@ -3777,7 +3777,7 @@
}
}
-static char *complete_add_queue_member(char *line, char *word, int pos, int state)
+static char *complete_add_queue_member(const char *line, const char *word, int pos, int state)
{
/* 0 - add; 1 - queue; 2 - member; 3 - <member>; 4 - to; 5 - <queue>; 6 - penalty; 7 - <penalty> */
switch (pos) {
@@ -3845,7 +3845,7 @@
}
}
-static char *complete_remove_queue_member(char *line, char *word, int pos, int state)
+static char *complete_remove_queue_member(const char *line, const char *word, int pos, int state)
{
int which = 0;
struct ast_call_queue *q;
Modified: team/russell/make_output/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/apps/app_voicemail.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/apps/app_voicemail.c (original)
+++ team/russell/make_output/apps/app_voicemail.c Wed Jan 18 17:24:08 2006
@@ -5803,7 +5803,7 @@
return RESULT_SUCCESS;
}
-static char *complete_show_voicemail_users(char *line, char *word, int pos, int state)
+static char *complete_show_voicemail_users(const char *line, const char *word, int pos, int state)
{
int which = 0;
int wordlen;
Modified: team/russell/make_output/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/asterisk.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/asterisk.c (original)
+++ team/russell/make_output/asterisk.c Wed Jan 18 17:24:08 2006
@@ -324,7 +324,7 @@
#undef FORMAT
}
-static char *complete_show_version_files(char *line, char *word, int pos, int state)
+static char *complete_show_version_files(const char *line, const char *word, int pos, int state)
{
struct file_version *find;
int which = 0;
Modified: team/russell/make_output/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/channels/chan_agent.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/channels/chan_agent.c (original)
+++ team/russell/make_output/channels/chan_agent.c Wed Jan 18 17:24:08 2006
@@ -1622,7 +1622,7 @@
return 0;
}
-static char *complete_agent_logoff_cmd(char *line, char *word, int pos, int state)
+static char *complete_agent_logoff_cmd(const char *line, const char *word, int pos, int state)
{
struct agent_pvt *p;
char name[AST_MAX_AGENT];
Modified: team/russell/make_output/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/channels/chan_iax2.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/channels/chan_iax2.c (original)
+++ team/russell/make_output/channels/chan_iax2.c Wed Jan 18 17:24:08 2006
@@ -1970,7 +1970,7 @@
return RESULT_SUCCESS;
}
-static char *complete_iax2_show_peer(char *line, char *word, int pos, int state)
+static char *complete_iax2_show_peer(const char *line, const char *word, int pos, int state)
{
int which = 0;
struct iax2_peer *p;
@@ -7631,7 +7631,7 @@
return 0;
}
-static char *iax2_prov_complete_template_3rd(char *line, char *word, int pos, int state)
+static char *iax2_prov_complete_template_3rd(const char *line, const char *word, int pos, int state)
{
if (pos != 3)
return NULL;
Modified: team/russell/make_output/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/channels/chan_oss.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/channels/chan_oss.c (original)
+++ team/russell/make_output/channels/chan_oss.c Wed Jan 18 17:24:08 2006
@@ -975,7 +975,7 @@
return RESULT_SUCCESS;
}
-static char *autoanswer_complete(char *line, char *word, int pos, int state)
+static char *autoanswer_complete(const char *line, const char *word, int pos, int state)
{
int l = strlen(word);
Modified: team/russell/make_output/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/channels/chan_sip.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/channels/chan_sip.c (original)
+++ team/russell/make_output/channels/chan_sip.c Wed Jan 18 17:24:08 2006
@@ -8401,7 +8401,7 @@
}
/*! \brief complete_sipch: Support routine for 'sip show channel' CLI ---*/
-static char *complete_sipch(char *line, char *word, int pos, int state)
+static char *complete_sipch(const char *line, const char *word, int pos, int state)
{
int which=0;
struct sip_pvt *cur;
@@ -8422,7 +8422,7 @@
}
/*! \brief complete_sip_peer: Do completion on peer name ---*/
-static char *complete_sip_peer(char *word, int state, int flags2)
+static char *complete_sip_peer(const char *word, const int state, int flags2)
{
char *result = NULL;
int wordlen = strlen(word);
@@ -8442,7 +8442,7 @@
}
/*! \brief complete_sip_show_peer: Support routine for 'sip show peer' CLI ---*/
-static char *complete_sip_show_peer(char *line, char *word, int pos, int state)
+static char *complete_sip_show_peer(const char *line, const char *word, int pos, int state)
{
if (pos == 3)
return complete_sip_peer(word, state, 0);
@@ -8451,7 +8451,7 @@
}
/*! \brief complete_sip_debug_peer: Support routine for 'sip debug peer' CLI ---*/
-static char *complete_sip_debug_peer(char *line, char *word, int pos, int state)
+static char *complete_sip_debug_peer(const char *line, const char *word, int pos, int state)
{
if (pos == 3)
return complete_sip_peer(word, state, 0);
@@ -8460,7 +8460,7 @@
}
/*! \brief complete_sip_user: Do completion on user name ---*/
-static char *complete_sip_user(char *word, int state, int flags2)
+static char *complete_sip_user(const char *word, int state, int flags2)
{
char *result = NULL;
int wordlen = strlen(word);
@@ -8480,7 +8480,7 @@
}
/*! \brief complete_sip_show_user: Support routine for 'sip show user' CLI ---*/
-static char *complete_sip_show_user(char *line, char *word, int pos, int state)
+static char *complete_sip_show_user(const char *line, const char *word, int pos, int state)
{
if (pos == 3)
return complete_sip_user(word, state, 0);
@@ -8489,7 +8489,7 @@
}
/*! \brief complete_sipnotify: Support routine for 'sip notify' CLI ---*/
-static char *complete_sipnotify(char *line, char *word, int pos, int state)
+static char *complete_sipnotify(const char *line, const char *word, int pos, int state)
{
char *c = NULL;
@@ -8521,7 +8521,7 @@
}
/*! \brief complete_sip_prune_realtime_peer: Support routine for 'sip prune realtime peer' CLI ---*/
-static char *complete_sip_prune_realtime_peer(char *line, char *word, int pos, int state)
+static char *complete_sip_prune_realtime_peer(const char *line, const char *word, int pos, int state)
{
if (pos == 4)
return complete_sip_peer(word, state, SIP_PAGE2_RTCACHEFRIENDS);
@@ -8529,7 +8529,7 @@
}
/*! \brief complete_sip_prune_realtime_user: Support routine for 'sip prune realtime user' CLI ---*/
-static char *complete_sip_prune_realtime_user(char *line, char *word, int pos, int state)
+static char *complete_sip_prune_realtime_user(const char *line, const char *word, int pos, int state)
{
if (pos == 4)
return complete_sip_user(word, state, SIP_PAGE2_RTCACHEFRIENDS);
Modified: team/russell/make_output/channels/iax2-provision.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/channels/iax2-provision.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/channels/iax2-provision.c (original)
+++ team/russell/make_output/channels/iax2-provision.c Wed Jan 18 17:24:08 2006
@@ -154,7 +154,7 @@
return cur;
}
-char *iax_prov_complete_template(char *line, char *word, int pos, int state)
+char *iax_prov_complete_template(const char *line, const char *word, int pos, int state)
{
struct iax_template *c;
int which=0;
Modified: team/russell/make_output/channels/iax2-provision.h
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/channels/iax2-provision.h?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/channels/iax2-provision.h (original)
+++ team/russell/make_output/channels/iax2-provision.h Wed Jan 18 17:24:08 2006
@@ -50,4 +50,4 @@
extern int iax_provision_unload(void);
extern int iax_provision_build(struct iax_ie_data *provdata, unsigned int *signature, const char *template, int force);
extern int iax_provision_version(unsigned int *signature, const char *template, int force);
-extern char *iax_prov_complete_template(char *line, char *word, int pos, int state);
+extern char *iax_prov_complete_template(const char *line, const char *word, int pos, int state);
Modified: team/russell/make_output/cli.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/cli.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/cli.c (original)
+++ team/russell/make_output/cli.c Wed Jan 18 17:24:08 2006
@@ -508,7 +508,7 @@
return RESULT_SUCCESS;
}
-static char *__ast_cli_generator(char *text, char *word, int state, int lock);
+static char *__ast_cli_generator(const char *text, const char *word, int state, int lock);
static int handle_commandmatchesarray(int fd, int argc, char *argv[])
{
@@ -762,7 +762,7 @@
return RESULT_SUCCESS;
}
-static char *complete_show_channels(char *line, char *word, int pos, int state)
+static char *complete_show_channels(const char *line, const char *word, int pos, int state)
{
static char *choices[] = { "concise", "verbose" };
int match = 0;
@@ -785,7 +785,7 @@
return NULL;
}
-static char *complete_ch_helper(char *line, char *word, int pos, int state, int rpos)
+static char *complete_ch_helper(const char *line, const char *word, int pos, int state, int rpos)
{
struct ast_channel *c = NULL;
int which = 0;
@@ -811,27 +811,27 @@
return ret;
}
-static char *complete_ch_3(char *line, char *word, int pos, int state)
+static char *complete_ch_3(const char *line, const char *word, int pos, int state)
{
return complete_ch_helper(line, word, pos, state, 2);
}
-static char *complete_ch_4(char *line, char *word, int pos, int state)
+static char *complete_ch_4(const char *line, const char *word, int pos, int state)
{
return complete_ch_helper(line, word, pos, state, 3);
}
-static char *complete_mod_2(char *line, char *word, int pos, int state)
+static char *complete_mod_2(const char *line, const char *word, int pos, int state)
{
return ast_module_helper(line, word, pos, state, 1, 1);
}
-static char *complete_mod_4(char *line, char *word, int pos, int state)
+static char *complete_mod_4(const char *line, const char *word, int pos, int state)
{
return ast_module_helper(line, word, pos, state, 3, 0);
}
-static char *complete_fn(char *line, char *word, int pos, int state)
+static char *complete_fn(const char *line, const char *word, int pos, int state)
{
char *c;
char filename[256];
@@ -903,7 +903,7 @@
static int handle_help(int fd, int argc, char *argv[]);
-static char * complete_help(char *text, char *word, int pos, int state)
+static char * complete_help(const char *text, const char *word, int pos, int state)
{
/* skip first 4 or 5 chars, "help "*/
int l = strlen(text);
@@ -941,7 +941,7 @@
{ { NULL }, NULL, NULL, NULL }
};
-static struct ast_cli_entry *find_cli(char *cmds[], int exact)
+static struct ast_cli_entry *find_cli(char *const cmds[], int exact)
{
int x;
int y;
@@ -987,7 +987,7 @@
return NULL;
}
-static void join(char *dest, size_t destsize, char *w[], int tws)
+static void join(char *dest, size_t destsize, char *const w[], int tws)
{
ast_join(dest, destsize, w);
@@ -995,7 +995,7 @@
strncat(dest, " ", destsize - strlen(dest) - 1);
}
-static void join2(char *dest, size_t destsize, char *w[])
+static void join2(char *dest, size_t destsize, char *const w[])
{
int x;
/* Join words into a string */
@@ -1186,7 +1186,7 @@
return RESULT_SUCCESS;
}
-static char *parse_args(char *s, int *argc, char *argv[], int max, int *trailingwhitespace)
+static char *parse_args(const char *s, int *argc, char *argv[], int max, int *trailingwhitespace)
{
char *dup, *cur;
int x = 0;
@@ -1247,7 +1247,7 @@
}
/* This returns the number of unique matches for the generator */
-int ast_cli_generatornummatches(char *text, char *word)
+int ast_cli_generatornummatches(const char *text, const char *word)
{
int matches = 0, i = 0;
char *buf = NULL, *oldbuf = NULL;
@@ -1264,7 +1264,7 @@
return matches;
}
-char **ast_cli_completion_matches(char *text, char *word)
+char **ast_cli_completion_matches(const char *text, const char *word)
{
char **match_list = NULL, *retstr, *prevstr;
size_t match_list_len, max_equal, which, i;
@@ -1303,7 +1303,7 @@
return match_list;
}
-static char *__ast_cli_generator(char *text, char *word, int state, int lock)
+static char *__ast_cli_generator(const char *text, const char *word, int state, int lock)
{
char *argv[AST_MAX_ARGS];
struct ast_cli_entry *e, *e1, *e2;
@@ -1379,12 +1379,12 @@
return NULL;
}
-char *ast_cli_generator(char *text, char *word, int state)
+char *ast_cli_generator(const char *text, const char *word, int state)
{
return __ast_cli_generator(text, word, state, 1);
}
-int ast_cli_command(int fd, char *s)
+int ast_cli_command(int fd, const char *s)
{
char *argv[AST_MAX_ARGS];
struct ast_cli_entry *e;
Modified: team/russell/make_output/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/codecs/Makefile?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/codecs/Makefile (original)
+++ team/russell/make_output/codecs/Makefile Wed Jan 18 17:24:08 2006
@@ -74,10 +74,6 @@
LIBLPC10=lpc10/liblpc10.a
-ifeq ($(findstring BSD,${OSARCH}),BSD)
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
-endif
-
CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \
codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
codec_g726.so
Modified: team/russell/make_output/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/formats/Makefile?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/formats/Makefile (original)
+++ team/russell/make_output/formats/Makefile Wed Jan 18 17:24:08 2006
@@ -27,10 +27,6 @@
#
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
FORMAT_LIBS+=format_ogg_vorbis.so
-endif
-
-ifeq ($(findstring BSD,${OSARCH}),BSD)
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
GSMLIB=../codecs/gsm/lib/libgsm.a
Modified: team/russell/make_output/include/asterisk/cli.h
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/include/asterisk/cli.h?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/include/asterisk/cli.h (original)
+++ team/russell/make_output/include/asterisk/cli.h Wed Jan 18 17:24:08 2006
@@ -44,8 +44,7 @@
/*! \brief A command line entry */
struct ast_cli_entry {
- /*! Null terminated list of the words of the command */
- char * cmda[AST_MAX_CMD_LEN];
+ char * const cmda[AST_MAX_CMD_LEN];
/*! Handler for the command (fd for output, # of args, argument list).
Returns RESULT_SHOWUSAGE for improper arguments.
argv[] has argc 'useful' entries, and an additional NULL entry
@@ -67,7 +66,7 @@
Typically, the function is called with increasing values for n
until a NULL is returned.
*/
- char *(*generator)(char *line, char *word, int pos, int n);
+ char *(*generator)(const char *line, const char *word, int pos, int n);
/*! For linking */
struct ast_cli_entry *next;
/*! For keeping track of usage */
@@ -79,7 +78,7 @@
* Interpret a command s, sending output to fd
* Returns 0 on succes, -1 on failure
*/
-int ast_cli_command(int fd, char *s);
+int ast_cli_command(int fd, const char *s);
/*! \brief Registers a command or an array of commands
* \param e which cli entry to register
@@ -114,9 +113,9 @@
* Useful for readline, that's about it
* Returns 0 on success, -1 on failure
*/
-char *ast_cli_generator(char *, char *, int);
+char *ast_cli_generator(const char *, const char *, int);
-int ast_cli_generatornummatches(char *, char *);
+int ast_cli_generatornummatches(const char *, const char *);
/*!
* \brief Generates a NULL-terminated array of strings that
@@ -129,8 +128,7 @@
* All strings and the array itself are malloc'ed and must be freed
* by the caller.
*/
-char **ast_cli_completion_matches(char *, char *);
-
+char **ast_cli_completion_matches(const char *, const char *);
#if defined(__cplusplus) || defined(c_plusplus)
}
Modified: team/russell/make_output/include/asterisk/module.h
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/include/asterisk/module.h?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/include/asterisk/module.h (original)
+++ team/russell/make_output/include/asterisk/module.h Wed Jan 18 17:24:08 2006
@@ -242,7 +242,7 @@
* \return A possible completion of the partial match, or NULL if no matches
* were found.
*/
-char *ast_module_helper(char *line, char *word, int pos, int state, int rpos, int needsreload);
+char *ast_module_helper(const char *line, const char *word, int pos, int state, int rpos, int needsreload);
/*!
* \brief Register a function to be executed before Asterisk exits.
Modified: team/russell/make_output/loader.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/loader.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/loader.c (original)
+++ team/russell/make_output/loader.c Wed Jan 18 17:24:08 2006
@@ -164,7 +164,7 @@
return res;
}
-char *ast_module_helper(char *line, char *word, int pos, int state, int rpos, int needsreload)
+char *ast_module_helper(const char *line, const char *word, int pos, int state, int rpos, int needsreload)
{
struct module *m;
int which=0;
Modified: team/russell/make_output/manager.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/manager.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/manager.c (original)
+++ team/russell/make_output/manager.c Wed Jan 18 17:24:08 2006
@@ -161,7 +161,7 @@
return res;
}
-static char *complete_show_mancmd(char *line, char *word, int pos, int state)
+static char *complete_show_mancmd(const char *line, const char *word, int pos, int state)
{
struct manager_action *cur = first_action;
int which = 0;
Modified: team/russell/make_output/pbx.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/pbx.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/pbx.c (original)
+++ team/russell/make_output/pbx.c Wed Jan 18 17:24:08 2006
@@ -1082,7 +1082,7 @@
return RESULT_SUCCESS;
}
-static char *complete_show_function(char *line, char *word, int pos, int state)
+static char *complete_show_function(const char *line, const char *word, int pos, int state)
{
struct ast_custom_function *acf;
char *ret = NULL;
@@ -2834,7 +2834,7 @@
* application at one time. You can type 'show application Dial Echo' and
* you will see informations about these two applications ...
*/
-static char *complete_show_application(char *line, char *word, int pos, int state)
+static char *complete_show_application(const char *line, const char *word, int pos, int state)
{
struct ast_app *a;
char *ret = NULL;
@@ -3067,7 +3067,7 @@
return RESULT_SUCCESS;
}
-static char *complete_show_applications(char *line, char *word, int pos, int state)
+static char *complete_show_applications(const char *line, const char *word, int pos, int state)
{
int wordlen = strlen(word);
@@ -3101,7 +3101,7 @@
/*
* 'show dialplan' CLI command implementation functions ...
*/
-static char *complete_show_dialplan_context(char *line, char *word, int pos,
+static char *complete_show_dialplan_context(const char *line, const char *word, int pos,
int state)
{
struct ast_context *c = NULL;
Modified: team/russell/make_output/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/pbx/pbx_config.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/pbx/pbx_config.c (original)
+++ team/russell/make_output/pbx/pbx_config.c Wed Jan 18 17:24:08 2006
@@ -143,7 +143,7 @@
return RESULT_FAILURE;
}
-static char *complete_context_dont_include(char *line, char *word,
+static char *complete_context_dont_include(const char *line, const char *word,
int pos, int state)
{
int which = 0;
@@ -449,7 +449,7 @@
* It's ugly, I know, but I'm waiting for Mark suggestion if upper is
* bug or feature ...
*/
-static int fix_complete_args(char *line, char **word, int *pos)
+static int fix_complete_args(const char *line, char **word, int *pos)
{
char *_line, *_strsep_line, *_previous_word = NULL, *_word = NULL;
int words = 0;
@@ -481,13 +481,14 @@
}
#endif /* BROKEN_READLINE */
-static char *complete_context_remove_extension(char *line, char *word, int pos,
+static char *complete_context_remove_extension(const char *line, const char *word2, int pos,
int state)
{
char *ret = NULL;
int which = 0;
#ifdef BROKEN_READLINE
+ char *word = (char *)word2; /* fool the compiler. XXX will go away later */
/*
* Fix arguments, *word is a new allocated structure, REMEMBER to
* free *word when you want to return from this function ...
@@ -496,6 +497,8 @@
ast_log(LOG_ERROR, "Out of free memory\n");
return NULL;
}
+#else
+ const char *word = word2;
#endif
/*
@@ -745,7 +748,7 @@
return RESULT_SUCCESS;
}
-static char *complete_context_add_include(char *line, char *word, int pos,
+static char *complete_context_add_include(const char *line, const char *word, int pos,
int state)
{
struct ast_context *c;
@@ -1243,7 +1246,7 @@
}
/*! add extension 6123,1,Dial,IAX/212.71.138.13/6123 into local */
-static char *complete_context_add_extension(char *line, char *word,
+static char *complete_context_add_extension(const char *line, const char *word,
int pos, int state)
{
int which = 0;
@@ -1326,7 +1329,7 @@
return RESULT_SUCCESS;
}
-static char *complete_context_add_ignorepat(char *line, char *word,
+static char *complete_context_add_ignorepat(const char *line, const char *word,
int pos, int state)
{
if (pos == 3) return state == 0 ? strdup("into") : NULL;
@@ -1427,7 +1430,7 @@
return RESULT_SUCCESS;
}
-static char *complete_context_remove_ignorepat(char *line, char *word,
+static char *complete_context_remove_ignorepat(const char *line, const char *word,
int pos, int state)
{
struct ast_context *c;
Modified: team/russell/make_output/pbx/pbx_dundi.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/pbx/pbx_dundi.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/pbx/pbx_dundi.c (original)
+++ team/russell/make_output/pbx/pbx_dundi.c Wed Jan 18 17:24:08 2006
@@ -2226,7 +2226,7 @@
}
}
-static char *complete_peer_helper(char *line, char *word, int pos, int state, int rpos)
+static char *complete_peer_helper(const char *line, const char *word, int pos, int state, int rpos)
{
int which=0;
char *ret;
@@ -2251,7 +2251,7 @@
return ret;
}
-static char *complete_peer_4(char *line, char *word, int pos, int state)
+static char *complete_peer_4(const char *line, const char *word, int pos, int state)
{
return complete_peer_helper(line, word, pos, state, 3);
}
Modified: team/russell/make_output/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/res/Makefile?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/res/Makefile (original)
+++ team/russell/make_output/res/Makefile Wed Jan 18 17:24:08 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-MODS=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so
+MODS=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so res_clioriginate.so
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
ifneq (${OSARCH},FreeBSD)
Modified: team/russell/make_output/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/res/res_features.c?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/res/res_features.c (original)
+++ team/russell/make_output/res/res_features.c Wed Jan 18 17:24:08 2006
@@ -1272,7 +1272,7 @@
src = chan;
else if ((monitor_exec = pbx_builtin_getvar_helper(peer, "AUTO_MONITOR")))
src = peer;
- if (src) {
+ if (monitor_app && src) {
char *tmp = ast_strdupa(monitor_exec);
if (tmp) {
pbx_exec(src, monitor_app, tmp, 1);
@@ -1998,11 +1998,6 @@
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
cfg = ast_config_load("features.conf");
- if (!cfg) {
- cfg = ast_config_load("parking.conf");
- if (cfg)
- ast_log(LOG_NOTICE, "parking.conf is deprecated in favor of 'features.conf'. Please rename it.\n");
- }
if (cfg) {
var = ast_variable_browse(cfg, "general");
while(var) {
Modified: team/russell/make_output/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/utils/Makefile?rev=8218&r1=8217&r2=8218&view=diff
==============================================================================
--- team/russell/make_output/utils/Makefile (original)
+++ team/russell/make_output/utils/Makefile Wed Jan 18 17:24:08 2006
@@ -15,10 +15,6 @@
# Don't use ast mm routines
#
CFLAGS+=-DNO_AST_MM
-
-ifeq ($(findstring BSD,${OSARCH}),BSD)
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
-endif
TARGET=stereorize streamplayer
More information about the svn-commits
mailing list