[svn-commits] seanbright: branch seanbright/resolve-shadow-warnings r137057 - in /team/sean...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sun Aug 10 10:02:26 CDT 2008
Author: seanbright
Date: Sun Aug 10 10:02:24 2008
New Revision: 137057
URL: http://svn.digium.com/view/asterisk?view=rev&rev=137057
Log:
Merged revisions 137055 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r137055 | seanbright | 2008-08-10 10:45:25 -0400 (Sun, 10 Aug 2008) | 3 lines
More RSW merges. Everything from apps/ except for the big offenders
app_voicemail and app_queue.
........
Modified:
team/seanbright/resolve-shadow-warnings/ (props changed)
team/seanbright/resolve-shadow-warnings/apps/app_dahdibarge.c
team/seanbright/resolve-shadow-warnings/apps/app_disa.c
team/seanbright/resolve-shadow-warnings/apps/app_festival.c
team/seanbright/resolve-shadow-warnings/apps/app_forkcdr.c
team/seanbright/resolve-shadow-warnings/apps/app_minivm.c
team/seanbright/resolve-shadow-warnings/apps/app_rpt.c
Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Aug 10 10:02:24 2008
@@ -1,1 +1,1 @@
-/trunk:1-137029
+/trunk:1-137056
Modified: team/seanbright/resolve-shadow-warnings/apps/app_dahdibarge.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_dahdibarge.c?view=diff&rev=137057&r1=137056&r2=137057
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_dahdibarge.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_dahdibarge.c Sun Aug 10 10:02:24 2008
@@ -271,7 +271,7 @@
while(!confno && (++retrycnt < 4)) {
/* Prompt user for conference number */
confnostr[0] = '\0';
- res = ast_app_getdata(chan, "conf-getchannel", confnostr, sizeof(confnostr) - 1, 0);
+ res = ast_app_getdata(chan, "conf-getchannel",confnostr, sizeof(confnostr) - 1, 0);
if (res <0) goto out;
if (sscanf(confnostr, "%d", &confno) != 1)
confno = 0;
Modified: team/seanbright/resolve-shadow-warnings/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_disa.c?view=diff&rev=137057&r1=137056&r2=137057
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_disa.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_disa.c Sun Aug 10 10:02:24 2008
@@ -318,7 +318,7 @@
if (k == 3) {
int recheck = 0;
- struct ast_flags cdrflags = { 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) cdrflags.flags = 0;
- ast_cdr_reset(chan->cdr, &cdrflags);
+ 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/seanbright/resolve-shadow-warnings/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_festival.c?view=diff&rev=137057&r1=137056&r2=137057
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_festival.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_festival.c Sun Aug 10 10:02:24 2008
@@ -336,10 +336,10 @@
for (x = 0, j = 0; x < strlen(festivalcommand); x++) {
if (festivalcommand[x] == '\\' && festivalcommand[x + 1] == 'n') {
newfestivalcommand[j++] = '\n';
- i++;
+ x++;
} else if (festivalcommand[x] == '\\') {
newfestivalcommand[j++] = festivalcommand[x + 1];
- i++;
+ 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);
Modified: team/seanbright/resolve-shadow-warnings/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_forkcdr.c?view=diff&rev=137057&r1=137056&r2=137057
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_forkcdr.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_forkcdr.c Sun Aug 10 10:02:24 2008
@@ -229,7 +229,7 @@
if (!ast_strlen_zero(arglist.options))
ast_app_parse_options(forkcdr_exec_options, &flags, opts, arglist.options);
-
+
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);
Modified: team/seanbright/resolve-shadow-warnings/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_minivm.c?view=diff&rev=137057&r1=137056&r2=137057
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_minivm.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_minivm.c Sun Aug 10 10:02:24 2008
@@ -2192,7 +2192,6 @@
/*! \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_str;
Modified: team/seanbright/resolve-shadow-warnings/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_rpt.c?view=diff&rev=137057&r1=137056&r2=137057
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_rpt.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_rpt.c Sun Aug 10 10:02:24 2008
@@ -2165,12 +2165,11 @@
#ifdef NEW_ASTERISK
static void rpt_localtime( time_t * t, struct ast_tm *lt)
{
-struct timeval when;
+ struct timeval when;
when.tv_sec = *t;
when.tv_usec = 0;
ast_localtime(&when, lt, NULL);
-
}
#else
@@ -11228,12 +11227,14 @@
if (myrpt->reload)
{
+ struct rpt_tele *inner_telem;
+
rpt_mutex_lock(&myrpt->lock);
- telem = myrpt->tele.next;
- while(telem != &myrpt->tele)
- {
- ast_softhangup(telem->chan,AST_SOFTHANGUP_DEV);
- telem = telem->next;
+ inner_telem = myrpt->tele.next;
+ while(inner_telem != &myrpt->tele)
+ {
+ ast_softhangup(inner_telem->chan,AST_SOFTHANGUP_DEV);
+ inner_telem = inner_telem->next;
}
myrpt->reload = 0;
rpt_mutex_unlock(&myrpt->lock);
@@ -12185,7 +12186,7 @@
else if (strcmp((char *)f->data.ptr,myrpt->lasttone))
{
char *value = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->p.tonemacro, (char *)f->data.ptr);
- if (value)
+ if (value)
{
if (debug) ast_log(LOG_NOTICE,"Tone %s doing %s on node %s\n",(char *) f->data.ptr,value,myrpt->name);
rpt_mutex_lock(&myrpt->lock);
@@ -13404,7 +13405,7 @@
if (option_verbose > 2) ast_verbose( VERBOSE_PREFIX_3 "Call Parking Called, lot: %d, timeout: %d, context: %s\n", lot, timeout, return_context);
- snprintf(buffer,sizeof(buffer) - 1,"%d,%s",lot,template + 1);
+ snprintf(buffer, sizeof(buffer) - 1, "%d,%s", lot, template + 1);
rpt_telemetry(myrpt,REV_PATCH,buffer);
More information about the svn-commits
mailing list