[asterisk-commits] tilghman: branch tilghman/codec_bits2 r137268 - in /team/tilghman/codec_bits2...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Aug 11 12:05:25 CDT 2008
Author: tilghman
Date: Mon Aug 11 12:05:24 2008
New Revision: 137268
URL: http://svn.digium.com/view/asterisk?view=rev&rev=137268
Log:
Merged revisions 136751,136784,136787,136819,136859,136888,136890,136917,136947,137028,137055,137082,137089,137110,137112,137150,137203,137239 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r136751 | tilghman | 2008-08-07 21:34:17 -0500 (Thu, 07 Aug 2008) | 2 lines
Removing bad properties
................
r136784 | mmichelson | 2008-08-08 10:31:31 -0500 (Fri, 08 Aug 2008) | 3 lines
Fix compilation for ODBC voicemail
................
r136787 | dhubbard | 2008-08-08 10:58:38 -0500 (Fri, 08 Aug 2008) | 1 line
use ARRAY_LEN
................
r136819 | seanbright | 2008-08-08 13:19:33 -0500 (Fri, 08 Aug 2008) | 3 lines
Bring in the configure and makeopts jazz for -Wshadow, but don't add it to the
Makefile yet.
................
r136859 | tilghman | 2008-08-08 20:15:38 -0500 (Fri, 08 Aug 2008) | 4 lines
Update documentation as to the behavior of AGI in 1.6.0 and higher. Also, add
an OOB message that answers the question of, if AGI no longer shuts down the
connection on hangup, how will FastAGI know when to stop processing the call?
................
r136888 | seanbright | 2008-08-09 07:53:57 -0500 (Sat, 09 Aug 2008) | 4 lines
Merge more changes from the resolve-shadow-warnings branch (henceforth known
as RSW since i am too lazy to keep typing it all out). This time a few of
the channels.
................
r136890 | seanbright | 2008-08-09 08:13:48 -0500 (Sat, 09 Aug 2008) | 2 lines
Biggest offender? chan_dahdi.c! More RSW merging.
................
r136917 | seanbright | 2008-08-09 09:12:34 -0500 (Sat, 09 Aug 2008) | 2 lines
More RSW merges. This should do it for the channels/ dir.
................
r136947 | tilghman | 2008-08-09 10:26:27 -0500 (Sat, 09 Aug 2008) | 18 lines
Merged revisions 136946 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r136946 | tilghman | 2008-08-09 10:25:36 -0500 (Sat, 09 Aug 2008) | 10 lines
Merged revisions 136945 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r136945 | tilghman | 2008-08-09 10:24:36 -0500 (Sat, 09 Aug 2008) | 2 lines
Regression fixes for Solaris
........
................
................
r137028 | seanbright | 2008-08-09 19:47:56 -0500 (Sat, 09 Aug 2008) | 1 line
All of the res/ stuff (other than res_jabber) from the RSW branch.
................
r137055 | seanbright | 2008-08-10 09:45:25 -0500 (Sun, 10 Aug 2008) | 3 lines
More RSW merges. Everything from apps/ except for the big offenders
app_voicemail and app_queue.
................
r137082 | seanbright | 2008-08-10 14:35:50 -0500 (Sun, 10 Aug 2008) | 2 lines
Another big chunk of changes from the RSW branch. Bunch of stuff from main/
................
r137089 | seanbright | 2008-08-10 15:23:50 -0500 (Sun, 10 Aug 2008) | 3 lines
Another batch of files from RSW. The remaining apps and a few more
files from main/
................
r137110 | seanbright | 2008-08-10 15:57:25 -0500 (Sun, 10 Aug 2008) | 3 lines
That's all, folks. Not going to update the Makefile until res_jabber is
converted (snuffy, you there? :))
................
r137112 | seanbright | 2008-08-10 16:10:04 -0500 (Sun, 10 Aug 2008) | 3 lines
Fix this again so we can compile with shadow warnings enabled and IMAP chosen
in voicemail.
................
r137150 | tilghman | 2008-08-10 19:25:28 -0500 (Sun, 10 Aug 2008) | 13 lines
Merged revisions 137138 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r137138 | tilghman | 2008-08-10 19:20:38 -0500 (Sun, 10 Aug 2008) | 5 lines
Deallocate database connection handle on disconnect, as we allocate another
one on connect.
(closes issue #13271)
Reported by: dveiga
........
................
r137203 | seanbright | 2008-08-11 09:25:15 -0500 (Mon, 11 Aug 2008) | 7 lines
Log the userfield CDR variable like the other CDR backends, assuming the
column is actually there. If it's not, we still log everything else as
before.
(closes issue #13281)
Reported by: falves11
................
r137239 | russell | 2008-08-11 11:14:29 -0500 (Mon, 11 Aug 2008) | 2 lines
Make PRINT_DIR work as advertised.
................
Modified:
team/tilghman/codec_bits2/ (props changed)
team/tilghman/codec_bits2/Makefile
team/tilghman/codec_bits2/UPGRADE.txt
team/tilghman/codec_bits2/apps/app_adsiprog.c
team/tilghman/codec_bits2/apps/app_dahdibarge.c
team/tilghman/codec_bits2/apps/app_dahdiscan.c
team/tilghman/codec_bits2/apps/app_dial.c
team/tilghman/codec_bits2/apps/app_directory.c
team/tilghman/codec_bits2/apps/app_disa.c
team/tilghman/codec_bits2/apps/app_festival.c
team/tilghman/codec_bits2/apps/app_forkcdr.c
team/tilghman/codec_bits2/apps/app_macro.c
team/tilghman/codec_bits2/apps/app_meetme.c
team/tilghman/codec_bits2/apps/app_minivm.c
team/tilghman/codec_bits2/apps/app_osplookup.c
team/tilghman/codec_bits2/apps/app_playback.c
team/tilghman/codec_bits2/apps/app_queue.c
team/tilghman/codec_bits2/apps/app_record.c
team/tilghman/codec_bits2/apps/app_rpt.c
team/tilghman/codec_bits2/apps/app_sms.c
team/tilghman/codec_bits2/apps/app_voicemail.c
team/tilghman/codec_bits2/apps/app_waituntil.c
team/tilghman/codec_bits2/apps/app_while.c
team/tilghman/codec_bits2/cdr/cdr_tds.c
team/tilghman/codec_bits2/channels/chan_agent.c
team/tilghman/codec_bits2/channels/chan_alsa.c
team/tilghman/codec_bits2/channels/chan_console.c
team/tilghman/codec_bits2/channels/chan_dahdi.c
team/tilghman/codec_bits2/channels/chan_features.c
team/tilghman/codec_bits2/channels/chan_iax2.c
team/tilghman/codec_bits2/channels/chan_jingle.c
team/tilghman/codec_bits2/channels/chan_mgcp.c
team/tilghman/codec_bits2/channels/chan_phone.c
team/tilghman/codec_bits2/channels/chan_sip.c
team/tilghman/codec_bits2/channels/chan_skinny.c
team/tilghman/codec_bits2/channels/chan_unistim.c
team/tilghman/codec_bits2/channels/iax2-parser.c
team/tilghman/codec_bits2/channels/xpmr/xpmr.c
team/tilghman/codec_bits2/codecs/codec_dahdi.c
team/tilghman/codec_bits2/configure
team/tilghman/codec_bits2/configure.ac
team/tilghman/codec_bits2/include/asterisk/astobj2.h
team/tilghman/codec_bits2/include/asterisk/channel.h
team/tilghman/codec_bits2/include/asterisk/compat.h
team/tilghman/codec_bits2/main/abstract_jb.c
team/tilghman/codec_bits2/main/acl.c
team/tilghman/codec_bits2/main/app.c
team/tilghman/codec_bits2/main/asterisk.c
team/tilghman/codec_bits2/main/astobj2.c
team/tilghman/codec_bits2/main/audiohook.c
team/tilghman/codec_bits2/main/callerid.c
team/tilghman/codec_bits2/main/cdr.c
team/tilghman/codec_bits2/main/channel.c
team/tilghman/codec_bits2/main/cli.c
team/tilghman/codec_bits2/main/config.c
team/tilghman/codec_bits2/main/db1-ast/btree/bt_delete.c
team/tilghman/codec_bits2/main/db1-ast/btree/bt_put.c
team/tilghman/codec_bits2/main/db1-ast/recno/rec_delete.c
team/tilghman/codec_bits2/main/db1-ast/recno/rec_put.c
team/tilghman/codec_bits2/main/event.c
team/tilghman/codec_bits2/main/features.c
team/tilghman/codec_bits2/main/file.c
team/tilghman/codec_bits2/main/frame.c
team/tilghman/codec_bits2/main/http.c
team/tilghman/codec_bits2/main/indications.c
team/tilghman/codec_bits2/main/jitterbuf.c
team/tilghman/codec_bits2/main/logger.c
team/tilghman/codec_bits2/main/manager.c
team/tilghman/codec_bits2/main/pbx.c
team/tilghman/codec_bits2/main/rtp.c
team/tilghman/codec_bits2/main/say.c
team/tilghman/codec_bits2/main/sched.c
team/tilghman/codec_bits2/main/taskprocessor.c
team/tilghman/codec_bits2/main/tdd.c
team/tilghman/codec_bits2/main/udptl.c
team/tilghman/codec_bits2/makeopts.in
team/tilghman/codec_bits2/res/ael/ael.flex
team/tilghman/codec_bits2/res/ael/ael_lex.c
team/tilghman/codec_bits2/res/res_adsi.c
team/tilghman/codec_bits2/res/res_agi.c
team/tilghman/codec_bits2/res/res_config_ldap.c
team/tilghman/codec_bits2/res/res_config_pgsql.c
team/tilghman/codec_bits2/res/res_musiconhold.c
team/tilghman/codec_bits2/res/res_odbc.c
team/tilghman/codec_bits2/res/res_phoneprov.c
team/tilghman/codec_bits2/res/res_smdi.c
team/tilghman/codec_bits2/res/res_timing_pthread.c
Propchange: team/tilghman/codec_bits2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/tilghman/codec_bits2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 11 12:05:24 2008
@@ -1,1 +1,1 @@
-/trunk:1-136750
+/trunk:1-137267
Modified: team/tilghman/codec_bits2/Makefile
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/Makefile?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/Makefile (original)
+++ team/tilghman/codec_bits2/Makefile Mon Aug 11 12:05:24 2008
@@ -320,7 +320,7 @@
SILENTMAKE:=$(MAKE) --quiet --no-print-directory
ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
-SUBMAKE:=$(MAKE) --quiet
+SUBMAKE:=$(MAKE)
else
SUBMAKE:=$(MAKE) --quiet --no-print-directory
endif
@@ -377,9 +377,9 @@
makeopts.embed_rules: menuselect.makeopts
@echo "Generating embedded module rules ..."
@rm -f $@
- @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
- @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS)
- @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS)
+ @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
+ @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
+ @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
$(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
@@ -402,10 +402,10 @@
endif
$(MOD_SUBDIRS):
- @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS):
- @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
@@ -433,10 +433,10 @@
@rm -f $@.tmp
$(SUBDIRS_CLEAN):
- @$(MAKE) $(PRINT_DIR) -C $(@:-clean=) clean
+ @$(SUBMAKE) -C $(@:-clean=) clean
$(SUBDIRS_DIST_CLEAN):
- @$(MAKE) $(PRINT_DIR) -C $(@:-dist-clean=) dist-clean
+ @$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
clean: $(SUBDIRS_CLEAN)
rm -f defaults.h
@@ -547,7 +547,7 @@
fi
$(SUBDIRS_INSTALL):
- @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) --quiet $(PRINT_DIR) -C $(@:-install=) install
+ @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -811,7 +811,7 @@
@cmp -s .cleancount .lastclean || $(MAKE) clean
$(SUBDIRS_UNINSTALL):
- @$(MAKE) $(PRINT_DIR) -C $(@:-uninstall=) uninstall
+ @$(SUBMAKE) -C $(@:-uninstall=) uninstall
_uninstall: $(SUBDIRS_UNINSTALL)
rm -f $(DESTDIR)$(MODULES_DIR)/*
Modified: team/tilghman/codec_bits2/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/UPGRADE.txt?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/UPGRADE.txt (original)
+++ team/tilghman/codec_bits2/UPGRADE.txt Mon Aug 11 12:05:24 2008
@@ -168,7 +168,8 @@
systemname was too long, the uniqueid would have been truncated.
* The cdr_tds module now supports all versions of FreeTDS that contain
- the db-lib frontend.
+ the db-lib frontend. It will also now log the userfield variable if
+ the target database table contains a column for it.
Formats:
Modified: team/tilghman/codec_bits2/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_adsiprog.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_adsiprog.c (original)
+++ team/tilghman/codec_bits2/apps/app_adsiprog.c Mon Aug 11 12:05:24 2008
@@ -776,7 +776,7 @@
static int subscript(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
- char subscript[80];
+ char subscr[80];
struct adsi_subscript *sub;
if (!tok) {
@@ -784,12 +784,12 @@
return 0;
}
- if (process_token(subscript, tok, sizeof(subscript) - 1, ARG_STRING)) {
+ if (process_token(subscr, tok, sizeof(subscr) - 1, ARG_STRING)) {
ast_log(LOG_WARNING, "Invalid number of seconds '%s' at line %d of %s\n", tok, lineno, script);
return 0;
}
- if (!(sub = getsubbyname(state, subscript, script, lineno)))
+ if (!(sub = getsubbyname(state, subscr, script, lineno)))
return 0;
buf[0] = 0x9d;
@@ -801,7 +801,7 @@
static int onevent(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
{
char *tok = get_token(&args, script, lineno);
- char subscript[80], sname[80];
+ char subscr[80], sname[80];
int sawin = 0, event, snums[8], scnt = 0, x;
struct adsi_subscript *sub;
@@ -848,11 +848,11 @@
ast_log(LOG_WARNING, "Missing subscript to call at line %d of %s\n", lineno, script);
return 0;
}
- if (process_token(subscript, tok, sizeof(subscript) - 1, ARG_STRING)) {
+ if (process_token(subscr, tok, sizeof(subscr) - 1, ARG_STRING)) {
ast_log(LOG_WARNING, "Invalid subscript '%s' at line %d of %s\n", tok, lineno, script);
return 0;
}
- if (!(sub = getsubbyname(state, subscript, script, lineno)))
+ if (!(sub = getsubbyname(state, subscr, script, lineno)))
return 0;
buf[0] = 8;
buf[1] = event;
Modified: team/tilghman/codec_bits2/apps/app_dahdibarge.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_dahdibarge.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_dahdibarge.c (original)
+++ team/tilghman/codec_bits2/apps/app_dahdibarge.c Mon Aug 11 12:05:24 2008
@@ -251,11 +251,11 @@
static int conf_exec(struct ast_channel *chan, void *data)
{
- int res=-1;
+ int res = -1;
int retrycnt = 0;
int confflags = 0;
int confno = 0;
- char confstr[80] = "";
+ char confnostr[80] = "";
if (!ast_strlen_zero(data)) {
if ((sscanf(data, "DAHDI/%d", &confno) != 1) &&
@@ -270,10 +270,10 @@
while(!confno && (++retrycnt < 4)) {
/* Prompt user for conference number */
- confstr[0] = '\0';
- res = ast_app_getdata(chan, "conf-getchannel",confstr, sizeof(confstr) - 1, 0);
+ confnostr[0] = '\0';
+ res = ast_app_getdata(chan, "conf-getchannel",confnostr, sizeof(confnostr) - 1, 0);
if (res <0) goto out;
- if (sscanf(confstr, "%d", &confno) != 1)
+ if (sscanf(confnostr, "%d", &confno) != 1)
confno = 0;
}
if (confno) {
Modified: team/tilghman/codec_bits2/apps/app_dahdiscan.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_dahdiscan.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_dahdiscan.c (original)
+++ team/tilghman/codec_bits2/apps/app_dahdiscan.c Mon Aug 11 12:05:24 2008
@@ -284,7 +284,7 @@
int res=-1;
int confflags = 0;
int confno = 0;
- char confstr[80] = "", *tmp = NULL;
+ char confnostr[80] = "", *tmp = NULL;
struct ast_channel *tempchan = NULL, *lastchan = NULL, *ichan = NULL;
struct ast_frame *f;
char *desired_group;
@@ -335,12 +335,12 @@
}
if (tempchan && (!strcmp(tempchan->tech->type, "DAHDI")) && (tempchan != chan)) {
ast_verb(3, "DAHDI channel %s is in-use, monitoring...\n", tempchan->name);
- ast_copy_string(confstr, tempchan->name, sizeof(confstr));
+ ast_copy_string(confnostr, tempchan->name, sizeof(confnostr));
ast_channel_unlock(tempchan);
- if ((tmp = strchr(confstr, '-'))) {
+ if ((tmp = strchr(confnostr, '-'))) {
*tmp = '\0';
}
- confno = atoi(strchr(confstr, '/') + 1);
+ confno = atoi(strchr(confnostr, '/') + 1);
ast_stopstream(chan);
ast_say_number(chan, confno, AST_DIGIT_ANY, chan->language, (char *) NULL);
res = conf_run(chan, confno, confflags);
Modified: team/tilghman/codec_bits2/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_dial.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_dial.c (original)
+++ team/tilghman/codec_bits2/apps/app_dial.c Mon Aug 11 12:05:24 2008
@@ -2018,7 +2018,7 @@
{
char *parse;
const char *context = NULL;
- int sleep = 0, loops = 0, res = -1;
+ int sleepms = 0, loops = 0, res = -1;
struct ast_flags64 peerflags = { 0, };
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(announce);
@@ -2035,8 +2035,8 @@
parse = ast_strdupa(data);
AST_STANDARD_APP_ARGS(args, parse);
- if ((sleep = atoi(args.sleep)))
- sleep *= 1000;
+ if ((sleepms = atoi(args.sleep)))
+ sleepms *= 1000;
loops = atoi(args.retries);
@@ -2045,8 +2045,8 @@
goto done;
}
- if (sleep < 1000)
- sleep = 10000;
+ if (sleepms < 1000)
+ sleepms = 10000;
if (!loops)
loops = -1; /* run forever */
@@ -2077,10 +2077,10 @@
} else
ast_log(LOG_WARNING, "Announce file \"%s\" specified in Retrydial does not exist\n", args.announce);
}
- if (!res && sleep) {
+ if (!res && sleepms) {
if (!ast_test_flag(chan, AST_FLAG_MOH))
ast_moh_start(chan, NULL, NULL);
- res = ast_waitfordigit(chan, sleep);
+ res = ast_waitfordigit(chan, sleepms);
}
} else {
if (!ast_strlen_zero(args.announce)) {
@@ -2090,11 +2090,11 @@
} else
ast_log(LOG_WARNING, "Announce file \"%s\" specified in Retrydial does not exist\n", args.announce);
}
- if (sleep) {
+ if (sleepms) {
if (!ast_test_flag(chan, AST_FLAG_MOH))
ast_moh_start(chan, NULL, NULL);
if (!res)
- res = ast_waitfordigit(chan, sleep);
+ res = ast_waitfordigit(chan, sleepms);
}
}
}
Modified: team/tilghman/codec_bits2/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_directory.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_directory.c (original)
+++ team/tilghman/codec_bits2/apps/app_directory.c Mon Aug 11 12:05:24 2008
@@ -484,23 +484,23 @@
if (ucfg) {
for (cat = ast_category_browse(ucfg, NULL); cat ; cat = ast_category_browse(ucfg, cat)) {
- const char *pos;
+ const char *position;
if (!strcasecmp(cat, "general"))
continue;
if (!ast_true(ast_config_option(ucfg, cat, "hasdirectory")))
continue;
/* Find all candidate extensions */
- pos = ast_variable_retrieve(ucfg, cat, "fullname");
- if (!pos)
+ position = ast_variable_retrieve(ucfg, cat, "fullname");
+ if (!position)
continue;
res = 0;
if (ast_test_flag(&flags, OPT_LISTBYLASTNAME)) {
- res = check_match(&item, pos, cat, ext, 0 /* use_first_name */);
+ res = check_match(&item, position, cat, ext, 0 /* use_first_name */);
}
if (!res && ast_test_flag(&flags, OPT_LISTBYFIRSTNAME)) {
- res = check_match(&item, pos, cat, ext, 1 /* use_first_name */);
+ res = check_match(&item, position, cat, ext, 1 /* use_first_name */);
}
if (!res)
Modified: team/tilghman/codec_bits2/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_disa.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_disa.c (original)
+++ team/tilghman/codec_bits2/apps/app_disa.c Mon Aug 11 12:05:24 2008
@@ -318,7 +318,7 @@
if (k == 3) {
int recheck = 0;
- struct ast_flags flags = { AST_CDR_FLAG_POSTED };
+ struct ast_flags cdr_flags = { AST_CDR_FLAG_POSTED };
if (!ast_exists_extension(chan, args.context, exten, 1, chan->cid.cid_num)) {
pbx_builtin_setvar_helper(chan, "INVALID_EXTEN", exten);
@@ -337,8 +337,8 @@
if (!ast_strlen_zero(acctcode))
ast_string_field_set(chan, accountcode, acctcode);
- if (special_noanswer) flags.flags = 0;
- ast_cdr_reset(chan->cdr, &flags);
+ if (special_noanswer) cdr_flags.flags = 0;
+ ast_cdr_reset(chan->cdr, &cdr_flags);
ast_explicit_goto(chan, args.context, exten, 1);
return 0;
}
Modified: team/tilghman/codec_bits2/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_festival.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_festival.c (original)
+++ team/tilghman/codec_bits2/apps/app_festival.c Mon Aug 11 12:05:24 2008
@@ -330,22 +330,22 @@
snprintf(newfestivalcommand, strln, "%s%s%s", startcmd, args.text, endcmd);
festivalcommand = newfestivalcommand;
} else { /* This else parses the festivalcommand that we're sent from the config file for \n's, etc */
- int i, j;
+ int x, j;
newfestivalcommand = alloca(strlen(festivalcommand) + strlen(args.text) + 1);
- for (i = 0, j = 0; i < strlen(festivalcommand); i++) {
- if (festivalcommand[i] == '\\' && festivalcommand[i + 1] == 'n') {
+ for (x = 0, j = 0; x < strlen(festivalcommand); x++) {
+ if (festivalcommand[x] == '\\' && festivalcommand[x + 1] == 'n') {
newfestivalcommand[j++] = '\n';
- i++;
- } else if (festivalcommand[i] == '\\') {
- newfestivalcommand[j++] = festivalcommand[i + 1];
- i++;
- } else if (festivalcommand[i] == '%' && festivalcommand[i + 1] == 's') {
+ x++;
+ } else if (festivalcommand[x] == '\\') {
+ newfestivalcommand[j++] = festivalcommand[x + 1];
+ x++;
+ } else if (festivalcommand[x] == '%' && festivalcommand[x + 1] == 's') {
sprintf(&newfestivalcommand[j], "%s", args.text); /* we know it is big enough */
j += strlen(args.text);
- i++;
+ x++;
} else
- newfestivalcommand[j++] = festivalcommand[i];
+ newfestivalcommand[j++] = festivalcommand[x];
}
newfestivalcommand[j] = '\0';
festivalcommand = newfestivalcommand;
Modified: team/tilghman/codec_bits2/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_forkcdr.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_forkcdr.c (original)
+++ team/tilghman/codec_bits2/apps/app_forkcdr.c Mon Aug 11 12:05:24 2008
@@ -229,9 +229,11 @@
if (!ast_strlen_zero(arglist.options))
ast_app_parse_options(forkcdr_exec_options, &flags, opts, arglist.options);
-
- if (!ast_strlen_zero(data))
- ast_set2_flag(chan->cdr, ast_test_flag(&flags, OPT_KEEPVARS), AST_CDR_FLAG_KEEP_VARS);
+
+ if (!ast_strlen_zero(data)) {
+ int keepvars = ast_test_flag(&flags, OPT_KEEPVARS) ? 1 : 0;
+ ast_set2_flag(chan->cdr, keepvars, AST_CDR_FLAG_KEEP_VARS);
+ }
ast_cdr_fork(chan, flags, opts[OPT_ARG_VARSET]);
Modified: team/tilghman/codec_bits2/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_macro.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_macro.c (original)
+++ team/tilghman/codec_bits2/apps/app_macro.c Mon Aug 11 12:05:24 2008
@@ -253,12 +253,12 @@
ast_channel_lock(chan);
while((cur = strsep(&rest, ",")) && (argc < MAX_ARGS)) {
- const char *s;
+ const char *argp;
/* Save copy of old arguments if we're overwriting some, otherwise
let them pass through to the other macro */
snprintf(varname, sizeof(varname), "ARG%d", argc);
- if ((s = pbx_builtin_getvar_helper(chan, varname))) {
- oldargs[argc] = ast_strdup(s);
+ if ((argp = pbx_builtin_getvar_helper(chan, varname))) {
+ oldargs[argc] = ast_strdup(argp);
}
pbx_builtin_setvar_helper(chan, varname, cur);
argc++;
@@ -329,12 +329,12 @@
gosub_level++;
ast_debug(1, "Incrementing gosub_level\n");
} else if (!strcasecmp(runningapp, "GOSUBIF")) {
- char tmp2[1024], *cond, *app, *app2 = tmp2;
+ char tmp2[1024], *cond, *app_arg, *app2 = tmp2;
pbx_substitute_variables_helper(chan, runningdata, tmp2, sizeof(tmp2) - 1);
cond = strsep(&app2, "?");
- app = strsep(&app2, ":");
+ app_arg = strsep(&app2, ":");
if (pbx_checkcondition(cond)) {
- if (!ast_strlen_zero(app)) {
+ if (!ast_strlen_zero(app_arg)) {
gosub_level++;
ast_debug(1, "Incrementing gosub_level\n");
}
Modified: team/tilghman/codec_bits2/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_meetme.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_meetme.c (original)
+++ team/tilghman/codec_bits2/apps/app_meetme.c Mon Aug 11 12:05:24 2008
@@ -1536,9 +1536,9 @@
int announcement_played = 0;
struct timeval now;
struct ast_dsp *dsp = NULL;
- struct ast_app *app;
+ struct ast_app *agi_app;
char *agifile;
- const char *agifiledefault = "conf-background.agi", *tmp;
+ const char *agifiledefault = "conf-background.agi", *tmpvar;
char meetmesecs[30] = "";
char exitcontext[AST_MAX_CONTEXT] = "";
char recordingtmp[AST_MAX_EXTENSION] = "";
@@ -1787,8 +1787,8 @@
if (confflags & CONFFLAG_EXIT_CONTEXT) {
ast_channel_lock(chan);
- if ((tmp = pbx_builtin_getvar_helper(chan, "MEETME_EXIT_CONTEXT"))) {
- ast_copy_string(exitcontext, tmp, sizeof(exitcontext));
+ if ((tmpvar = pbx_builtin_getvar_helper(chan, "MEETME_EXIT_CONTEXT"))) {
+ ast_copy_string(exitcontext, tmpvar, sizeof(exitcontext));
} else if (!ast_strlen_zero(chan->macrocontext)) {
ast_copy_string(exitcontext, chan->macrocontext, sizeof(exitcontext));
} else {
@@ -1986,8 +1986,8 @@
or use default filename of conf-background.agi */
ast_channel_lock(chan);
- if ((tmp = pbx_builtin_getvar_helper(chan, "MEETME_AGI_BACKGROUND"))) {
- agifile = ast_strdupa(tmp);
+ if ((tmpvar = pbx_builtin_getvar_helper(chan, "MEETME_AGI_BACKGROUND"))) {
+ agifile = ast_strdupa(tmpvar);
} else {
agifile = ast_strdupa(agifiledefault);
}
@@ -1999,9 +1999,9 @@
ast_channel_setoption(chan, AST_OPTION_TONE_VERIFY, &x, sizeof(char), 0);
}
/* Find a pointer to the agi app and execute the script */
- app = pbx_findapp("agi");
- if (app) {
- ret = pbx_exec(chan, app, agifile);
+ agi_app = pbx_findapp("agi");
+ if (agi_app) {
+ ret = pbx_exec(chan, agi_app, agifile);
} else {
ast_log(LOG_WARNING, "Could not find application (agi)\n");
ret = -2;
@@ -2600,27 +2600,27 @@
((confflags & CONFFLAG_MONITOR) ||
(user->adminflags & (ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED)) ||
(!user->talking)) ) {
- int index;
- for (index = 0; index < AST_FRAME_BITS; index++)
- if (chan->rawwriteformat & (1 << index))
+ int idx;
+ for (idx = 0; idx < AST_FRAME_BITS; idx++)
+ if (chan->rawwriteformat & (1 << idx))
break;
- if (index >= AST_FRAME_BITS)
+ if (idx >= AST_FRAME_BITS)
goto bailoutandtrynormal;
ast_mutex_lock(&conf->listenlock);
- if (!conf->transframe[index]) {
+ if (!conf->transframe[idx]) {
if (conf->origframe) {
- if (!conf->transpath[index])
- conf->transpath[index] = ast_translator_build_path((1 << index), AST_FORMAT_SLINEAR);
- if (conf->transpath[index]) {
- conf->transframe[index] = ast_translate(conf->transpath[index], conf->origframe, 0);
- if (!conf->transframe[index])
- conf->transframe[index] = &ast_null_frame;
+ if (!conf->transpath[idx])
+ conf->transpath[idx] = ast_translator_build_path((1 << idx), AST_FORMAT_SLINEAR);
+ if (conf->transpath[idx]) {
+ conf->transframe[idx] = ast_translate(conf->transpath[idx], conf->origframe, 0);
+ if (!conf->transframe[idx])
+ conf->transframe[idx] = &ast_null_frame;
}
}
}
- if (conf->transframe[index]) {
- if (conf->transframe[index]->frametype != AST_FRAME_NULL) {
- if (ast_write(chan, conf->transframe[index]))
+ if (conf->transframe[idx]) {
+ if (conf->transframe[idx]->frametype != AST_FRAME_NULL) {
+ if (ast_write(chan, conf->transframe[idx]))
ast_log(LOG_WARNING, "Unable to write frame to channel %s\n", chan->name);
}
} else {
@@ -4059,7 +4059,7 @@
* \note Assumes that sla.lock is locked
*/
static struct sla_ringing_trunk *sla_choose_ringing_trunk(struct sla_station *station,
- struct sla_trunk_ref **trunk_ref, int remove)
+ struct sla_trunk_ref **trunk_ref, int rm)
{
struct sla_trunk_ref *s_trunk_ref;
struct sla_ringing_trunk *ringing_trunk = NULL;
@@ -4075,7 +4075,7 @@
if (sla_check_timed_out_station(ringing_trunk, station))
continue;
- if (remove)
+ if (rm)
AST_LIST_REMOVE_CURRENT(entry);
if (trunk_ref)
@@ -4590,7 +4590,7 @@
static int sla_process_timers(struct timespec *ts)
{
unsigned int timeout = UINT_MAX;
- struct timeval tv;
+ struct timeval wait;
unsigned int change_made = 0;
/* Check for ring timeouts on ringing trunks */
@@ -4614,9 +4614,9 @@
return 0;
if (ts) {
- tv = ast_tvadd(ast_tvnow(), ast_samp2tv(timeout, 1000));
- ts->tv_sec = tv.tv_sec;
- ts->tv_nsec = tv.tv_usec * 1000;
+ wait = ast_tvadd(ast_tvnow(), ast_samp2tv(timeout, 1000));
+ ts->tv_sec = wait.tv_sec;
+ ts->tv_nsec = wait.tv_usec * 1000;
}
return 1;
Modified: team/tilghman/codec_bits2/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_minivm.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_minivm.c (original)
+++ team/tilghman/codec_bits2/apps/app_minivm.c Mon Aug 11 12:05:24 2008
@@ -706,9 +706,9 @@
static int get_date(char *s, int len)
{
struct ast_tm tm;
- struct timeval tv = ast_tvnow();
-
- ast_localtime(&tv, &tm, NULL);
+ struct timeval now = ast_tvnow();
+
+ ast_localtime(&now, &tm, NULL);
return ast_strftime(s, len, "%a %b %e %r %Z %Y", &tm);
}
@@ -1040,18 +1040,18 @@
fprintf(p, "To: %s <%s@%s>\n", mailheader_quote(vmu->fullname, passdata2, len_passdata), vmu->username, vmu->domain);
if (!ast_strlen_zero(template->subject)) {
- char *passdata;
+ char *pass_data;
int vmlen = strlen(template->subject) * 3 + 200;
- if ((passdata = alloca(vmlen))) {
- pbx_substitute_variables_helper(ast, template->subject, passdata, vmlen);
- fprintf(p, "Subject: %s\n", passdata);
+ if ((pass_data = alloca(vmlen))) {
+ pbx_substitute_variables_helper(ast, template->subject, pass_data, vmlen);
+ fprintf(p, "Subject: %s\n", pass_data);
} else {
ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n");
fclose(p);
return -1;
}
- ast_debug(4, "-_-_- Subject now: %s\n", passdata);
+ ast_debug(4, "-_-_- Subject now: %s\n", pass_data);
} else {
fprintf(p, "Subject: New message in mailbox %s@%s\n", vmu->username, vmu->domain);
@@ -1071,12 +1071,12 @@
fprintf(p, "--%s\n", bound);
fprintf(p, "Content-Type: text/plain; charset=%s\nContent-Transfer-Encoding: 8bit\n\n", global_charset);
if (!ast_strlen_zero(template->body)) {
- char *passdata;
+ char *pass_data;
int vmlen = strlen(template->body)*3 + 200;
- if ((passdata = alloca(vmlen))) {
- pbx_substitute_variables_helper(ast, template->body, passdata, vmlen);
- ast_debug(3, "Message now: %s\n-----\n", passdata);
- fprintf(p, "%s\n", passdata);
+ if ((pass_data = alloca(vmlen))) {
+ pbx_substitute_variables_helper(ast, template->body, pass_data, vmlen);
+ ast_debug(3, "Message now: %s\n-----\n", pass_data);
+ fprintf(p, "%s\n", pass_data);
} else
ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n");
} else {
@@ -1400,11 +1400,11 @@
strsep(&stringp, "|");
if (!ast_strlen_zero(etemplate->locale)) {
- char *newlocale;
+ char *new_locale;
ast_copy_string(oldlocale, setlocale(LC_TIME, NULL), sizeof(oldlocale));
ast_debug(2, "-_-_- Changing locale from %s to %s\n", oldlocale, etemplate->locale);
- newlocale = setlocale(LC_TIME, etemplate->locale);
- if (newlocale == NULL) {
+ new_locale = setlocale(LC_TIME, etemplate->locale);
+ if (new_locale == NULL) {
ast_log(LOG_WARNING, "-_-_- Changing to new locale did not work. Locale: %s\n", etemplate->locale);
}
}
@@ -2192,9 +2192,8 @@
/*! \brief Add time zone to memory list */
static int timezone_add(const char *zonename, const char *config)
{
-
struct minivm_zone *newzone;
- char *msg_format, *timezone;
+ char *msg_format, *timezone_str;
newzone = ast_calloc(1, sizeof(*newzone));
if (newzone == NULL)
@@ -2207,7 +2206,7 @@
return 0;
}
- timezone = strsep(&msg_format, "|");
+ timezone_str = strsep(&msg_format, "|");
if (!msg_format) {
ast_log(LOG_WARNING, "Invalid timezone definition : %s\n", zonename);
ast_free(newzone);
@@ -2215,7 +2214,7 @@
}
ast_copy_string(newzone->name, zonename, sizeof(newzone->name));
- ast_copy_string(newzone->timezone, timezone, sizeof(newzone->timezone));
+ ast_copy_string(newzone->timezone, timezone_str, sizeof(newzone->timezone));
ast_copy_string(newzone->msg_format, msg_format, sizeof(newzone->msg_format));
AST_LIST_LOCK(&minivm_zones);
@@ -2675,7 +2674,7 @@
/*! \brief Show stats */
static char *handle_minivm_show_stats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- struct ast_tm time;
+ struct ast_tm timebuf;
char buf[BUFSIZ];
switch (cmd) {
@@ -2700,12 +2699,12 @@
ast_cli(a->fd, " Received messages since last reset: <none>\n");
} else {
ast_cli(a->fd, " Received messages since last reset: %d\n", global_stats.receivedmessages);
- ast_localtime(&global_stats.lastreceived, &time, NULL);
- ast_strftime(buf, sizeof(buf), "%a %b %e %r %Z %Y", &time);
+ ast_localtime(&global_stats.lastreceived, &timebuf, NULL);
+ ast_strftime(buf, sizeof(buf), "%a %b %e %r %Z %Y", &timebuf);
ast_cli(a->fd, " Last received voicemail: %s\n", buf);
}
- ast_localtime(&global_stats.reset, &time, NULL);
- ast_strftime(buf, sizeof(buf), "%a %b %e %r %Z %Y", &time);
+ ast_localtime(&global_stats.reset, &timebuf, NULL);
+ ast_strftime(buf, sizeof(buf), "%a %b %e %r %Z %Y", &timebuf);
ast_cli(a->fd, " Last reset: %s\n", buf);
ast_cli(a->fd, "\n");
Modified: team/tilghman/codec_bits2/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_osplookup.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_osplookup.c (original)
+++ team/tilghman/codec_bits2/apps/app_osplookup.c Mon Aug 11 12:05:24 2008
@@ -1193,7 +1193,7 @@
int recorded,
int cause,
time_t start,
- time_t connect,
+ time_t connect_time,
time_t end,
unsigned int release)
{
@@ -1216,11 +1216,11 @@
error = OSPPTransactionReportUsage(
handle,
- difftime(end, connect),
+ difftime(end, connect_time),
start,
end,
alert,
- connect,
+ connect_time,
isPddInfoPresent,
pdd,
release,
@@ -1664,7 +1664,7 @@
int inhandle = OSP_INVALID_HANDLE;
int outhandle = OSP_INVALID_HANDLE;
int recorded = 0;
- time_t start, connect, end;
+ time_t start, connect_time, end;
unsigned int release;
char buffer[OSP_INTSTR_SIZE];
const char* status;
@@ -1713,24 +1713,24 @@
if (chan->cdr) {
start = chan->cdr->start.tv_sec;
- connect = chan->cdr->answer.tv_sec;
- if (connect) {
+ connect_time = chan->cdr->answer.tv_sec;
+ if (connect_time) {
end = time(NULL);
} else {
- end = connect;
+ end = connect_time;
}
} else {
start = 0;
- connect = 0;
+ connect_time = 0;
end = 0;
}
ast_debug(1, "OSPFinish: start '%ld'\n", start);
- ast_debug(1, "OSPFinish: connect '%ld'\n", connect);
+ ast_debug(1, "OSPFinish: connect '%ld'\n", connect_time);
ast_debug(1, "OSPFinish: end '%ld'\n", end);
release = ast_check_hangup(chan) ? 0 : 1;
- if (osp_finish(outhandle, recorded, cause, start, connect, end, release) <= 0) {
+ if (osp_finish(outhandle, recorded, cause, start, connect_time, end, release) <= 0) {
ast_debug(1, "OSPFinish: Unable to report usage for outbound call\n");
}
switch (cause) {
@@ -1740,7 +1740,7 @@
cause = AST_CAUSE_NO_ROUTE_DESTINATION;
break;
}
- if (osp_finish(inhandle, recorded, cause, start, connect, end, release) <= 0) {
+ if (osp_finish(inhandle, recorded, cause, start, connect_time, end, release) <= 0) {
ast_debug(1, "OSPFinish: Unable to report usage for inbound call\n");
}
snprintf(buffer, sizeof(buffer), "%d", OSP_INVALID_HANDLE);
Modified: team/tilghman/codec_bits2/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_playback.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_playback.c (original)
+++ team/tilghman/codec_bits2/apps/app_playback.c Mon Aug 11 12:05:24 2008
@@ -275,16 +275,16 @@
}
static int say_date_generic(struct ast_channel *chan, time_t t,
- const char *ints, const char *lang, const char *format, const char *timezone, const char *prefix)
+ const char *ints, const char *lang, const char *format, const char *timezonename, const char *prefix)
{
char buf[128];
struct ast_tm tm;
- struct timeval tv = { t, 0 };
+ struct timeval when = { t, 0 };
say_args_t a = { chan, ints, lang, -1, -1 };
if (format == NULL)
format = "";
- ast_localtime(&tv, &tm, NULL);
+ ast_localtime(&when, &tm, NULL);
snprintf(buf, sizeof(buf), "%s:%s:%04d%02d%02d%02d%02d.%02d-%d-%3d",
prefix,
format,
@@ -300,9 +300,9 @@
}
static int say_date_with_format(struct ast_channel *chan, time_t t,
- const char *ints, const char *lang, const char *format, const char *timezone)
-{
- return say_date_generic(chan, t, ints, lang, format, timezone, "datetime");
+ const char *ints, const char *lang, const char *format, const char *timezonename)
+{
+ return say_date_generic(chan, t, ints, lang, format, timezonename, "datetime");
}
static int say_date(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
Modified: team/tilghman/codec_bits2/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/codec_bits2/apps/app_queue.c?view=diff&rev=137268&r1=137267&r2=137268
==============================================================================
--- team/tilghman/codec_bits2/apps/app_queue.c (original)
+++ team/tilghman/codec_bits2/apps/app_queue.c Mon Aug 11 12:05:24 2008
@@ -1056,7 +1056,7 @@
char *timestr, *maxstr, *minstr, *contentdup;
struct penalty_rule *rule = NULL, *rule_iter;
struct rule_list *rl_iter;
[... 11715 lines stripped ...]
More information about the asterisk-commits
mailing list