[svn-commits] russell: trunk r316293 - in /trunk: ./ apps/ channels/ codecs/lpc10/ formats/...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue May 3 15:45:41 CDT 2011
Author: russell
Date: Tue May 3 15:45:32 2011
New Revision: 316293
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316293
Log:
Merged revisions 316265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316265 | russell | 2011-05-03 14:55:49 -0500 (Tue, 03 May 2011) | 5 lines
Fix a bunch of compiler warnings generated by gcc 4.6.0.
Most of these are -Wunused-but-set-variable, but there were a few others
mixed in here, as well.
........
Modified:
trunk/ (props changed)
trunk/apps/app_amd.c
trunk/apps/app_festival.c
trunk/apps/app_followme.c
trunk/apps/app_ices.c
trunk/apps/app_minivm.c
trunk/apps/app_originate.c
trunk/apps/app_queue.c
trunk/apps/app_voicemail.c
trunk/channels/chan_agent.c
trunk/channels/chan_phone.c
trunk/channels/chan_skinny.c
trunk/channels/chan_unistim.c
trunk/codecs/lpc10/dyptrk.c
trunk/formats/format_wav.c
trunk/funcs/func_enum.c
trunk/include/asterisk/linkedlists.h
trunk/main/asterisk.c
trunk/main/audiohook.c
trunk/main/cdr.c
trunk/main/channel.c
trunk/main/config.c
trunk/main/dsp.c
trunk/main/features.c
trunk/main/file.c
trunk/main/fskmodem_float.c
trunk/main/manager.c
trunk/main/pbx.c
trunk/main/plc.c
trunk/main/rtp_engine.c
trunk/main/udptl.c
trunk/pbx/pbx_config.c
trunk/res/res_agi.c
trunk/res/res_calendar.c
trunk/res/res_fax.c
trunk/res/res_musiconhold.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: trunk/apps/app_amd.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_amd.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/apps/app_amd.c (original)
+++ trunk/apps/app_amd.c Tue May 3 15:45:32 2011
@@ -157,7 +157,6 @@
int iTotalTime = 0;
int iWordsCount = 0;
int currentState = STATE_IN_WORD;
- int previousState = STATE_IN_SILENCE;
int consecutiveVoiceDuration = 0;
char amdCause[256] = "", amdStatus[256] = "";
char *parse = ast_strdupa(data);
@@ -303,7 +302,6 @@
if (silenceDuration >= betweenWordsSilence) {
if (currentState != STATE_IN_SILENCE ) {
- previousState = currentState;
ast_verb(3, "AMD: Channel [%s]. Changed state to STATE_IN_SILENCE\n", chan->name);
}
/* Find words less than word duration */
@@ -343,7 +341,6 @@
if (consecutiveVoiceDuration >= minimumWordLength && currentState == STATE_IN_SILENCE) {
iWordsCount++;
ast_verb(3, "AMD: Channel [%s]. Word detected. iWordsCount:%d\n", chan->name, iWordsCount);
- previousState = currentState;
currentState = STATE_IN_WORD;
}
if (consecutiveVoiceDuration >= maximumWordLength){
Modified: trunk/apps/app_festival.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_festival.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/apps/app_festival.c (original)
+++ trunk/apps/app_festival.c Tue May 3 15:45:32 2011
@@ -163,7 +163,6 @@
{
int res = 0;
int fds[2];
- int pid = -1;
int needed = 0;
struct ast_format owriteformat;
struct ast_frame *f;
@@ -196,7 +195,6 @@
res = send_waveform_to_fd(waveform, length, fds[1]);
if (res >= 0) {
- pid = res;
/* Order is important -- there's almost always going to be mp3... we want to prioritize the
user */
for (;;) {
@@ -258,10 +256,6 @@
close(fds[0]);
close(fds[1]);
-#if 0
- if (pid > -1)
- kill(pid, SIGKILL);
-#endif
if (!res && owriteformat.id)
ast_set_write_format(chan, &owriteformat);
return res;
@@ -285,7 +279,6 @@
char ack[4];
char *waveform;
int filesize;
- int wave;
char bigstring[MAXFESTLEN];
int i;
struct MD5Context md5ctx;
@@ -494,7 +487,6 @@
/* Read back info from server */
/* This assumes only one waveform will come back, also LP is unlikely */
- wave = 0;
do {
int read_data;
for (n = 0; n < 3; ) {
Modified: trunk/apps/app_followme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_followme.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/apps/app_followme.c (original)
+++ trunk/apps/app_followme.c Tue May 3 15:45:32 2011
@@ -804,7 +804,6 @@
char *rest, *number;
struct findme_user *tmpuser;
struct findme_user *fmuser;
- struct findme_user *headuser;
struct findme_user_listptr *findme_user_list;
int status;
@@ -915,7 +914,6 @@
fmuser = NULL;
tmpuser = NULL;
- headuser = NULL;
if (winner)
break;
Modified: trunk/apps/app_ices.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_ices.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/apps/app_ices.c (original)
+++ trunk/apps/app_ices.c Tue May 3 15:45:32 2011
@@ -112,7 +112,6 @@
int pid = -1;
int flags;
struct ast_format oreadformat;
- struct timeval last;
struct ast_frame *f;
char filename[256]="";
char *c;
@@ -122,8 +121,6 @@
ast_log(LOG_WARNING, "ICES requires an argument (configfile.xml)\n");
return -1;
}
-
- last = ast_tv(0, 0);
if (pipe(fds)) {
ast_log(LOG_WARNING, "Unable to create pipe\n");
Modified: trunk/apps/app_minivm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_minivm.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/apps/app_minivm.c (original)
+++ trunk/apps/app_minivm.c Tue May 3 15:45:32 2011
@@ -1266,13 +1266,22 @@
char tmpcmd[PATH_MAX];
int tmpfd;
+ /**
+ * XXX
+ * /bug tmpfd is a leaked fd. The file is also never unlinked.
+ * See app_voicemail.c for how the code works there that
+ * doesn't have this bug.
+ */
+
ast_copy_string(newtmp, "/tmp/XXXXXX", sizeof(newtmp));
ast_debug(3, "newtmp: %s\n", newtmp);
tmpfd = mkstemp(newtmp);
- snprintf(tmpcmd, sizeof(tmpcmd), "sox -v %.4f %s.%s %s.%s", vmu->volgain, filename, format, newtmp, format);
- ast_safe_system(tmpcmd);
- finalfilename = newtmp;
- ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", filename, format, vmu->volgain, vmu->username);
+ if (tmpfd > -1) {
+ snprintf(tmpcmd, sizeof(tmpcmd), "sox -v %.4f %s.%s %s.%s", vmu->volgain, filename, format, newtmp, format);
+ ast_safe_system(tmpcmd);
+ finalfilename = newtmp;
+ ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", filename, format, vmu->volgain, vmu->username);
+ }
} else {
finalfilename = ast_strdupa(filename);
}
@@ -1828,7 +1837,6 @@
char callerid[256];
FILE *txt;
int res = 0, txtdes;
- int msgnum;
int duration = 0;
char date[256];
char tmpdir[PATH_MAX];
@@ -1871,7 +1879,6 @@
pbx_builtin_setvar_helper(chan, "MVM_RECORD_STATUS", "FAILED");
return res;
}
- msgnum = 0;
userdir = check_dirpath(tmpdir, sizeof(tmpdir), vmu->domain, username, "tmp");
@@ -2452,7 +2459,6 @@
char *message = NULL;
char *prompt = NULL;
int duration;
- int cmd;
if (ast_strlen_zero(data)) {
ast_log(LOG_ERROR, "MinivmAccmess needs at least two arguments: account and option\n");
@@ -2526,7 +2532,7 @@
}
snprintf(filename,sizeof(filename), "%s%s/%s/%s", MVM_SPOOL_DIR, vmu->domain, vmu->username, message);
/* Maybe we should check the result of play_record_review ? */
- cmd = play_record_review(chan, prompt, filename, global_maxgreet, default_vmformat, 0, vmu, &duration, NULL, FALSE);
+ play_record_review(chan, prompt, filename, global_maxgreet, default_vmformat, 0, vmu, &duration, NULL, FALSE);
ast_debug(1, "Recorded new %s message in %s (duration %d)\n", message, filename, duration);
@@ -3238,12 +3244,10 @@
check_dirpath(buf, len, vmu->domain, vmu->username, NULL);
} else { /* Look in channel variables */
struct ast_variable *var;
- int found = 0;
for (var = vmu->chanvars ; var ; var = var->next)
if (!strcmp(var->name, colname)) {
ast_copy_string(buf, var->value, len);
- found = 1;
break;
}
}
Modified: trunk/apps/app_originate.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_originate.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/apps/app_originate.c (original)
+++ trunk/apps/app_originate.c Tue May 3 15:45:32 2011
@@ -101,7 +101,6 @@
char *parse;
char *chantech, *chandata;
int res = -1;
- int outgoing_res = 0;
int outgoing_status = 0;
static const unsigned int timeout = 30;
static const char default_exten[] = "s";
@@ -154,14 +153,14 @@
ast_debug(1, "Originating call to '%s/%s' and connecting them to extension %s,%s,%d\n",
chantech, chandata, args.arg1, exten, priority);
- outgoing_res = ast_pbx_outgoing_exten(chantech, cap_slin, chandata,
+ ast_pbx_outgoing_exten(chantech, cap_slin, chandata,
timeout * 1000, args.arg1, exten, priority, &outgoing_status, 0, NULL,
NULL, NULL, NULL, NULL);
} else if (!strcasecmp(args.type, "app")) {
ast_debug(1, "Originating call to '%s/%s' and connecting them to %s(%s)\n",
chantech, chandata, args.arg1, S_OR(args.arg2, ""));
- outgoing_res = ast_pbx_outgoing_app(chantech, cap_slin, chandata,
+ ast_pbx_outgoing_app(chantech, cap_slin, chandata,
timeout * 1000, args.arg1, args.arg2, &outgoing_status, 0, NULL,
NULL, NULL, NULL, NULL);
} else {
Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue May 3 15:45:32 2011
@@ -4323,7 +4323,6 @@
char *agiexec = NULL;
char *macroexec = NULL;
char *gosubexec = NULL;
- int ret = 0;
const char *monitorfilename;
const char *monitor_exec;
const char *monitor_options;
@@ -4838,7 +4837,7 @@
/* We purposely lock the CDR so that pbx_exec does not update the application data */
if (qe->chan->cdr)
ast_set_flag(qe->chan->cdr, AST_CDR_FLAG_LOCKED);
- ret = pbx_exec(qe->chan, mixmonapp, mixmonargs);
+ pbx_exec(qe->chan, mixmonapp, mixmonargs);
if (qe->chan->cdr)
ast_clear_flag(qe->chan->cdr, AST_CDR_FLAG_LOCKED);
@@ -4970,7 +4969,7 @@
application = pbx_findapp("agi");
if (application) {
agiexec = ast_strdupa(agi);
- ret = pbx_exec(qe->chan, application, agiexec);
+ pbx_exec(qe->chan, application, agiexec);
} else
ast_log(LOG_WARNING, "Asked to execute an AGI on this channel, but could not find application (agi)!\n");
}
Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue May 3 15:45:32 2011
@@ -7061,7 +7061,6 @@
char *dir;
int curmsg;
char urgent_str[7] = "";
- char tmptxtfile[PATH_MAX];
int prompt_played = 0;
#ifndef IMAP_STORAGE
char msgfile[PATH_MAX], textfile[PATH_MAX], backup[PATH_MAX], backup_textfile[PATH_MAX];
@@ -7074,7 +7073,6 @@
dir = vms->curdir;
curmsg = vms->curmsg;
- tmptxtfile[0] = '\0';
while (!res && !valid_extensions) {
int use_directory = 0;
if (ast_test_flag((&globalflags), VM_DIRECFORWARD)) {
Modified: trunk/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_agent.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/channels/chan_agent.c (original)
+++ trunk/channels/chan_agent.c Tue May 3 15:45:32 2011
@@ -887,7 +887,6 @@
static int agent_hangup(struct ast_channel *ast)
{
struct agent_pvt *p = ast->tech_pvt;
- int howlong = 0;
ast_mutex_lock(&p->lock);
p->owner = NULL;
@@ -908,11 +907,8 @@
ast_debug(1, "Hangup called for state %s\n", ast_state2str(ast->_state));
if (p->start && (ast->_state != AST_STATE_UP)) {
- howlong = time(NULL) - p->start;
p->start = 0;
- } else if (ast->_state == AST_STATE_RESERVED)
- howlong = 0;
- else
+ } else
p->start = 0;
if (p->chan) {
p->chan->_bridge = NULL;
@@ -1856,7 +1852,6 @@
int max_login_tries = maxlogintries;
struct agent_pvt *p;
struct ast_module_user *u;
- int login_state = 0;
char user[AST_MAX_AGENT] = "";
char pass[AST_MAX_AGENT];
char agent[AST_MAX_AGENT] = "";
@@ -1950,7 +1945,6 @@
ast_mutex_lock(&p->lock);
if (!strcmp(p->agent, user) &&
!strcmp(p->password, pass) && !p->pending) {
- login_state = 1; /* Successful Login */
/* Ensure we can't be gotten until we're done */
p->lastdisc = ast_tvnow();
Modified: trunk/channels/chan_phone.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_phone.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/channels/chan_phone.c (original)
+++ trunk/channels/chan_phone.c Tue May 3 15:45:32 2011
@@ -295,12 +295,10 @@
ast_localtime(&UtcTime, &tm, NULL);
memset(&cid, 0, sizeof(PHONE_CID));
- if(&tm != NULL) {
- snprintf(cid.month, sizeof(cid.month), "%02d",(tm.tm_mon + 1));
- snprintf(cid.day, sizeof(cid.day), "%02d", tm.tm_mday);
- snprintf(cid.hour, sizeof(cid.hour), "%02d", tm.tm_hour);
- snprintf(cid.min, sizeof(cid.min), "%02d", tm.tm_min);
- }
+ snprintf(cid.month, sizeof(cid.month), "%02d",(tm.tm_mon + 1));
+ snprintf(cid.day, sizeof(cid.day), "%02d", tm.tm_mday);
+ snprintf(cid.hour, sizeof(cid.hour), "%02d", tm.tm_hour);
+ snprintf(cid.min, sizeof(cid.min), "%02d", tm.tm_min);
/* the standard format of ast->callerid is: "name" <number>, but not always complete */
if (!ast->connected.id.name.valid
|| ast_strlen_zero(ast->connected.id.name.str)) {
Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Tue May 3 15:45:32 2011
@@ -3610,8 +3610,6 @@
static char *handle_skinny_show_lines(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- int verbose = 0;
-
switch (cmd) {
case CLI_INIT:
e->command = "skinny show lines [verbose]";
@@ -3626,9 +3624,7 @@
}
if (a->argc == e->args) {
- if (!strcasecmp(a->argv[e->args-1], "verbose")) {
- verbose = 1;
- } else {
+ if (strcasecmp(a->argv[e->args-1], "verbose")) {
return CLI_SHOWUSAGE;
}
} else if (a->argc != e->args - 1) {
@@ -4039,7 +4035,6 @@
static int skinny_call(struct ast_channel *ast, char *dest, int timeout)
{
int res = 0;
- int tone = 0;
struct skinny_subchannel *sub = ast->tech_pvt;
struct skinny_line *l = sub->parent;
struct skinny_device *d = l->device;
@@ -4069,10 +4064,8 @@
switch (l->hookstate) {
case SKINNY_OFFHOOK:
- tone = SKINNY_CALLWAITTONE;
break;
case SKINNY_ONHOOK:
- tone = SKINNY_ALERT;
l->activesub = sub;
break;
default:
@@ -4101,7 +4094,6 @@
struct skinny_subchannel *sub = ast->tech_pvt;
struct skinny_line *l;
struct skinny_device *d;
- struct skinnysession *s;
if (!sub) {
ast_debug(1, "Asked to hangup channel not connected\n");
@@ -4110,7 +4102,6 @@
l = sub->parent;
d = l->device;
- s = d->session;
if (skinnydebug)
ast_verb(3,"Hanging up %s/%d\n",d->name,sub->callid);
@@ -5333,7 +5324,6 @@
struct ast_channel *c;
struct skinny_line *tmp;
int instance;
- int reference;
/* if any line on a device is offhook, than the device must be offhook,
unless we have shared lines CCM seems that it would never get here,
@@ -5349,7 +5339,6 @@
}
instance = letohl(req->data.offhook.instance);
- reference = letohl(req->data.offhook.reference);
if (instance) {
sub = find_subchannel_by_instance_reference(d, d->lastlineinstance, d->lastcallreference);
@@ -7177,8 +7166,6 @@
int on = 1;
struct ast_config *cfg;
char *cat;
- struct skinny_device *d;
- struct skinny_line *l;
int oldport = ntohs(bindaddr.sin_port);
struct ast_flags config_flags = { 0 };
@@ -7227,7 +7214,7 @@
config_parse_variables(TYPE_DEF_LINE, default_line, ast_variable_browse(cfg, "lines"));
cat = ast_category_browse(cfg, "lines");
while (cat && strcasecmp(cat, "general") && strcasecmp(cat, "devices")) {
- l = config_line(cat, ast_variable_browse(cfg, cat));
+ config_line(cat, ast_variable_browse(cfg, cat));
cat = ast_category_browse(cfg, cat);
}
@@ -7237,7 +7224,7 @@
config_parse_variables(TYPE_DEF_DEVICE, default_device, ast_variable_browse(cfg, "devices"));
cat = ast_category_browse(cfg, "devices");
while (cat && strcasecmp(cat, "general") && strcasecmp(cat, "lines")) {
- d = config_device(cat, ast_variable_browse(cfg, cat));
+ config_device(cat, ast_variable_browse(cfg, cat));
cat = ast_category_browse(cfg, cat);
}
Modified: trunk/channels/chan_unistim.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_unistim.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/channels/chan_unistim.c (original)
+++ trunk/channels/chan_unistim.c Tue May 3 15:45:32 2011
@@ -1924,7 +1924,7 @@
int res = 0;
struct ast_channel
*chana = NULL, *chanb = NULL, *bridgea = NULL, *bridgeb = NULL, *peera =
- NULL, *peerb = NULL, *peerc = NULL, *peerd = NULL;
+ NULL, *peerb = NULL, *peerc = NULL;
if (!p1->owner || !p2->owner) {
ast_log(LOG_WARNING, "Transfer attempted without dual ownership?\n");
@@ -1939,12 +1939,10 @@
peera = chana;
peerb = chanb;
peerc = bridgea;
- peerd = bridgeb;
} else if (bridgeb) {
peera = chanb;
peerb = chana;
peerc = bridgeb;
- peerd = bridgea;
}
if (peera && peerb && peerc && (peerb != peerc)) {
Modified: trunk/codecs/lpc10/dyptrk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/codecs/lpc10/dyptrk.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/codecs/lpc10/dyptrk.c (original)
+++ trunk/codecs/lpc10/dyptrk.c Tue May 3 15:45:32 2011
@@ -143,7 +143,7 @@
/* Local variables */
integer pbar;
real sbar;
- integer path[2], iptr, i__, j;
+ integer iptr, i__, j;
real alpha, minsc, maxsc;
/* Arguments */
@@ -389,7 +389,6 @@
for (i__ = 1; i__ <= 2; ++i__) {
j = j % 2 + 1;
*pitch = p[*pitch + j * 60 - 61];
- path[i__ - 1] = *pitch;
}
/* The following statement subtracts one from IPOINT, mod DEPTH. I
Modified: trunk/formats/format_wav.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_wav.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/formats/format_wav.c (original)
+++ trunk/formats/format_wav.c Tue May 3 15:45:32 2011
@@ -355,7 +355,6 @@
#if __BYTE_ORDER == __BIG_ENDIAN
int x;
#endif
- short *tmp;
int bytes;
off_t here;
/* Send a frame from the file to the appropriate channel */
@@ -382,8 +381,8 @@
s->fr.datalen = res;
s->fr.samples = samples = res / 2;
+#if __BYTE_ORDER == __BIG_ENDIAN
tmp = (short *)(s->fr.data.ptr);
-#if __BYTE_ORDER == __BIG_ENDIAN
/* file format is little endian so we need to swap */
for( x = 0; x < samples; x++)
tmp[x] = (tmp[x] << 8) | ((tmp[x] & 0xff00) >> 8);
Modified: trunk/funcs/func_enum.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_enum.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/funcs/func_enum.c (original)
+++ trunk/funcs/func_enum.c Tue May 3 15:45:32 2011
@@ -161,7 +161,6 @@
AST_APP_ARG(record);
AST_APP_ARG(zone);
);
- int res = 0;
char tech[80];
char dest[256] = "", tmp[2] = "", num[AST_MAX_EXTENSION] = "";
char *s, *p;
@@ -205,7 +204,7 @@
}
}
- res = ast_get_enum(chan, num, dest, sizeof(dest), tech, sizeof(tech), args.zone, args.options, record, NULL);
+ ast_get_enum(chan, num, dest, sizeof(dest), tech, sizeof(tech), args.zone, args.options, record, NULL);
p = strchr(dest, ':');
if (p && strcasecmp(tech, "ALL") && !strchr(args.options, 'u')) {
@@ -414,7 +413,6 @@
static int function_txtcidname(struct ast_channel *chan, const char *cmd,
char *data, char *buf, size_t len)
{
- int res;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(number);
AST_APP_ARG(zone);
@@ -438,7 +436,7 @@
args.zone = "e164.arpa";
}
- res = ast_get_txt(chan, args.number, buf, len, args.zone);
+ ast_get_txt(chan, args.number, buf, len, args.zone);
return 0;
}
Modified: trunk/include/asterisk/linkedlists.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/linkedlists.h?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/include/asterisk/linkedlists.h (original)
+++ trunk/include/asterisk/linkedlists.h Tue May 3 15:45:32 2011
@@ -535,7 +535,8 @@
(var); \
__list_prev = __new_prev, (var) = __list_next, \
__new_prev = (var), \
- __list_next = (var) ? (var)->field.next : NULL \
+ __list_next = (var) ? (var)->field.next : NULL, \
+ (void) __list_prev \
)
#define AST_RWLIST_TRAVERSE_SAFE_BEGIN AST_LIST_TRAVERSE_SAFE_BEGIN
Modified: trunk/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/asterisk.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Tue May 3 15:45:32 2011
@@ -365,11 +365,10 @@
struct file_version *iterator;
AST_RWLIST_WRLOCK(&file_versions);
- AST_RWLIST_TRAVERSE_SAFE_BEGIN(&file_versions, iterator, list) {
+ AST_RWLIST_TRAVERSE(&file_versions, iterator, list) {
if (!strcasecmp(iterator->file, file))
break;
- }
- AST_RWLIST_TRAVERSE_SAFE_END;
+ }
AST_RWLIST_UNLOCK(&file_versions);
if (iterator)
return iterator->version;
@@ -580,9 +579,9 @@
{
uint64_t physmem, freeram;
uint64_t freeswap = 0;
- int totalswap = 0;
int nprocs = 0;
long uptime = 0;
+ int totalswap = 0;
#if defined(HAVE_SYSINFO)
struct sysinfo sys_info;
sysinfo(&sys_info);
@@ -665,7 +664,7 @@
#if defined(HAVE_SYSINFO)
ast_cli(a->fd, " Buffer RAM: %" PRIu64 " KiB\n", ((uint64_t) sys_info.bufferram * sys_info.mem_unit) / 1024);
#endif
-#if defined (HAVE_SYSCTL) && defined(HAVE_SWAPCTL)
+#if defined (HAVE_SYSCTL) || defined(HAVE_SWAPCTL)
ast_cli(a->fd, " Total Swap Space: %u KiB\n", totalswap);
ast_cli(a->fd, " Free Swap Space: %" PRIu64 " KiB\n\n", freeswap);
#endif
Modified: trunk/main/audiohook.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/audiohook.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/audiohook.c (original)
+++ trunk/main/audiohook.c Tue May 3 15:45:32 2011
@@ -944,28 +944,25 @@
switch (type) {
case AST_AUDIOHOOK_TYPE_SPY:
- AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->spy_list, ah, list) {
+ AST_LIST_TRAVERSE(&chan->audiohooks->spy_list, ah, list) {
if (!strcmp(ah->source, source)) {
count++;
}
}
- AST_LIST_TRAVERSE_SAFE_END;
break;
case AST_AUDIOHOOK_TYPE_WHISPER:
- AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->whisper_list, ah, list) {
+ AST_LIST_TRAVERSE(&chan->audiohooks->whisper_list, ah, list) {
if (!strcmp(ah->source, source)) {
count++;
}
}
- AST_LIST_TRAVERSE_SAFE_END;
break;
case AST_AUDIOHOOK_TYPE_MANIPULATE:
- AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->manipulate_list, ah, list) {
+ AST_LIST_TRAVERSE(&chan->audiohooks->manipulate_list, ah, list) {
if (!strcmp(ah->source, source)) {
count++;
}
}
- AST_LIST_TRAVERSE_SAFE_END;
break;
default:
ast_debug(1, "Invalid audiohook type supplied, (%d)\n", type);
@@ -985,25 +982,22 @@
switch (type) {
case AST_AUDIOHOOK_TYPE_SPY:
- AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->spy_list, ah, list) {
+ AST_LIST_TRAVERSE(&chan->audiohooks->spy_list, ah, list) {
if ((!strcmp(ah->source, source)) && (ah->status == AST_AUDIOHOOK_STATUS_RUNNING))
count++;
}
- AST_LIST_TRAVERSE_SAFE_END;
break;
case AST_AUDIOHOOK_TYPE_WHISPER:
- AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->whisper_list, ah, list) {
+ AST_LIST_TRAVERSE(&chan->audiohooks->whisper_list, ah, list) {
if ((!strcmp(ah->source, source)) && (ah->status == AST_AUDIOHOOK_STATUS_RUNNING))
count++;
}
- AST_LIST_TRAVERSE_SAFE_END;
break;
case AST_AUDIOHOOK_TYPE_MANIPULATE:
- AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->audiohooks->manipulate_list, ah, list) {
+ AST_LIST_TRAVERSE(&chan->audiohooks->manipulate_list, ah, list) {
if ((!strcmp(ah->source, source)) && (ah->status == AST_AUDIOHOOK_STATUS_RUNNING))
count++;
}
- AST_LIST_TRAVERSE_SAFE_END;
break;
default:
ast_debug(1, "Invalid audiohook type supplied, (%d)\n", type);
Modified: trunk/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cdr.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Tue May 3 15:45:32 2011
@@ -716,11 +716,8 @@
void ast_cdr_start(struct ast_cdr *cdr)
{
- char *chan;
-
for (; cdr; cdr = cdr->next) {
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
- chan = S_OR(cdr->channel, "<unknown>");
check_post(cdr);
cdr->start = ast_tvnow();
}
@@ -768,11 +765,8 @@
void ast_cdr_noanswer(struct ast_cdr *cdr)
{
- char *chan;
-
while (cdr) {
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
- chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
check_post(cdr);
cdr->disposition = AST_CDR_NOANSWER;
}
@@ -892,11 +886,8 @@
int ast_cdr_init(struct ast_cdr *cdr, struct ast_channel *c)
{
- char *chan;
-
for ( ; cdr ; cdr = cdr->next) {
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
- chan = S_OR(cdr->channel, "<unknown>");
ast_copy_string(cdr->channel, c->name, sizeof(cdr->channel));
set_one_cid(cdr, c);
cdr_seq_inc(cdr);
@@ -1116,7 +1107,6 @@
static void post_cdr(struct ast_cdr *cdr)
{
- char *chan;
struct ast_cdr_beitem *i;
for ( ; cdr ; cdr = cdr->next) {
@@ -1134,7 +1124,6 @@
continue;
}
- chan = S_OR(cdr->channel, "<unknown>");
check_post(cdr);
ast_set_flag(cdr, AST_CDR_FLAG_POSTED);
if (ast_test_flag(cdr, AST_CDR_FLAG_POST_DISABLED))
Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue May 3 15:45:32 2011
@@ -2531,7 +2531,7 @@
if (info == NULL)
return NULL;
- AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->datastores, datastore, entry) {
+ AST_LIST_TRAVERSE(&chan->datastores, datastore, entry) {
if (datastore->info != info) {
continue;
}
@@ -2546,7 +2546,6 @@
break;
}
}
- AST_LIST_TRAVERSE_SAFE_END;
return datastore;
}
Modified: trunk/main/config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/config.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Tue May 3 15:45:32 2011
@@ -1021,7 +1021,6 @@
} else if (cur[0] == '#') { /* A directive - #include or #exec */
char *cur2;
char real_inclusion_name[256];
- struct ast_config_include *inclu;
int do_include = 0; /* otherwise, it is exec */
cur++;
@@ -1094,7 +1093,7 @@
}
/* A #include */
/* record this inclusion */
- inclu = ast_include_new(cfg, cfg->include_level == 1 ? "" : configfile, cur, !do_include, cur2, lineno, real_inclusion_name, sizeof(real_inclusion_name));
+ ast_include_new(cfg, cfg->include_level == 1 ? "" : configfile, cur, !do_include, cur2, lineno, real_inclusion_name, sizeof(real_inclusion_name));
do_include = ast_config_internal_load(cur, cfg, flags, real_inclusion_name, who_asked) ? 1 : 0;
if (!ast_strlen_zero(exec_file))
Modified: trunk/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/dsp.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/dsp.c (original)
+++ trunk/main/dsp.c Tue May 3 15:45:32 2011
@@ -787,7 +787,6 @@
float energy[6];
int best;
int second_best;
- float famp;
int i;
int j;
int sample;
@@ -812,7 +811,6 @@
/* The following unrolled loop takes only 35% (rough estimate) of the
time of a rolled loop on the machine on which it was developed */
for (j = sample; j < limit; j++) {
- famp = amp[j];
/* With GCC 2.95, the following unrolled code seems to take about 35%
(rough estimate) as long as a neat little 0-3 loop */
goertzel_sample(s->td.mf.tone_out, amp[j]);
Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Tue May 3 15:45:32 2011
@@ -918,7 +918,7 @@
static struct parkeduser *park_space_reserve(struct ast_channel *chan, struct ast_channel *peer, struct ast_park_call_args *args)
{
struct parkeduser *pu;
- int i, parking_space = -1, parking_range;
+ int i, parking_space = -1;
const char *parkinglotname = NULL;
const char *parkingexten;
struct ast_parkinglot *parkinglot = NULL;
@@ -1031,9 +1031,6 @@
int start;
struct parkeduser *cur = NULL;
- /* Select parking space within range */
- parking_range = parkinglot->parking_stop - parkinglot->parking_start + 1;
-
if (ast_test_flag(args, AST_PARK_OPT_RANDOMIZE)) {
start = ast_random() % (parkinglot->parking_stop - parkinglot->parking_start + 1);
} else {
@@ -1082,7 +1079,6 @@
static int park_call_full(struct ast_channel *chan, struct ast_channel *peer, struct ast_park_call_args *args)
{
struct ast_context *con;
- int parkingnum_copy;
struct parkeduser *pu = args->pu;
const char *event_from;
@@ -1111,7 +1107,6 @@
pu->start = ast_tvnow();
pu->parkingtime = (args->timeout > 0) ? args->timeout : pu->parkinglot->parkingtime;
- parkingnum_copy = pu->parkingnum;
if (args->extout)
*(args->extout) = pu->parkingnum;
@@ -3460,7 +3455,6 @@
int we_disabled_peer_cdr = 0;
struct ast_option_header *aoh;
struct ast_cdr *bridge_cdr = NULL;
- struct ast_cdr *orig_peer_cdr = NULL;
struct ast_cdr *chan_cdr = chan->cdr; /* the proper chan cdr, if there are forked cdrs */
struct ast_cdr *peer_cdr = peer->cdr; /* the proper chan cdr, if there are forked cdrs */
struct ast_cdr *new_chan_cdr = NULL; /* the proper chan cdr, if there are forked cdrs */
@@ -3532,8 +3526,7 @@
}
ast_copy_string(orig_channame,chan->name,sizeof(orig_channame));
ast_copy_string(orig_peername,peer->name,sizeof(orig_peername));
- orig_peer_cdr = peer_cdr;
-
+
if (!chan_cdr || (chan_cdr && !ast_test_flag(chan_cdr, AST_CDR_FLAG_POST_DISABLED))) {
if (chan_cdr) {
Modified: trunk/main/file.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/file.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Tue May 3 15:45:32 2011
@@ -147,7 +147,6 @@
int ast_writestream(struct ast_filestream *fs, struct ast_frame *f)
{
int res = -1;
- int alt = 0;
if (f->frametype == AST_FRAME_VIDEO) {
if (AST_FORMAT_GET_TYPE(fs->fmt->format.id) == AST_FORMAT_TYPE_AUDIO) {
/* This is the audio portion. Call the video one... */
@@ -160,9 +159,6 @@
return ast_writestream(fs->vfs, f);
/* else ignore */
return 0;
- } else {
- /* Might / might not have mark set */
- alt = 1;
}
} else if (f->frametype != AST_FRAME_VOICE) {
ast_log(LOG_WARNING, "Tried to write non-voice frame\n");
Modified: trunk/main/fskmodem_float.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/fskmodem_float.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/fskmodem_float.c (original)
+++ trunk/main/fskmodem_float.c Tue May 3 15:45:32 2011
@@ -225,9 +225,7 @@
int i,j,n1,r;
int samples = 0;
int olen;
- int beginlen=*len;
- int beginlenx;
-
+
switch (fskd->state) {
/* Pick up where we left off */
case STATE_SEARCH_STARTBIT2:
@@ -255,7 +253,6 @@
beginning of a start bit in the TDD sceanario. It just looks for sufficient
level to maybe, perhaps, guess, maybe that its maybe the beginning of
a start bit, perhaps. This whole thing stinks! */
- beginlenx=beginlen; /* just to avoid unused war warnings */
if (demodulator(fskd, &fskd->x1, GET_SAMPLE))
return -1;
samples++;
Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Tue May 3 15:45:32 2011
@@ -1717,7 +1717,7 @@
}
}
- return "";
+ return result;
}
/*! \brief
Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Tue May 3 15:45:32 2011
@@ -6692,7 +6692,6 @@
const char *exten, *context;
const char *id = astman_get_header(m, "ActionID");
char idtext[256];
- int res;
/* Variables used for different counters */
struct dialplan_counters counters;
@@ -6707,7 +6706,7 @@
exten = astman_get_header(m, "Extension");
context = astman_get_header(m, "Context");
- res = manager_show_dialplan_helper(s, m, idtext, context, exten, &counters, NULL);
+ manager_show_dialplan_helper(s, m, idtext, context, exten, &counters, NULL);
if (context && !counters.context_existence) {
char errorbuf[BUFSIZ];
@@ -7540,7 +7539,7 @@
int ast_build_timing(struct ast_timing *i, const char *info_in)
{
- char *info_save, *info;
+ char *info;
int j, num_fields, last_sep = -1;
/* Check for empty just in case */
@@ -7549,7 +7548,7 @@
}
/* make a copy just in case we were passed a static string */
- info_save = info = ast_strdupa(info_in);
+ info = ast_strdupa(info_in);
/* count the number of fields in the timespec */
for (j = 0, num_fields = 1; info[j] != '\0'; j++) {
Modified: trunk/main/plc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/plc.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/plc.c (original)
+++ trunk/main/plc.c Tue May 3 15:45:32 2011
@@ -177,10 +177,8 @@
float old_weight;
float new_weight;
float gain;
- int16_t *orig_amp;
int orig_len;
- orig_amp = amp;
orig_len = len;
if (s->missing_samples == 0) {
/* As the gap in real speech starts we need to assess the last known pitch,
Modified: trunk/main/rtp_engine.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/rtp_engine.c?view=diff&rev=316293&r1=316292&r2=316293
==============================================================================
--- trunk/main/rtp_engine.c (original)
+++ trunk/main/rtp_engine.c Tue May 3 15:45:32 2011
@@ -1283,8 +1283,8 @@
*tinstance0 = NULL, *tinstance1 = NULL;
struct ast_rtp_glue *glue0, *glue1;
struct ast_sockaddr addr1, addr2;
- enum ast_rtp_glue_result audio_glue0_res = AST_RTP_GLUE_RESULT_FORBID, video_glue0_res = AST_RTP_GLUE_RESULT_FORBID, text_glue0_res = AST_RTP_GLUE_RESULT_FORBID;
- enum ast_rtp_glue_result audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID, video_glue1_res = AST_RTP_GLUE_RESULT_FORBID, text_glue1_res = AST_RTP_GLUE_RESULT_FORBID;
+ enum ast_rtp_glue_result audio_glue0_res = AST_RTP_GLUE_RESULT_FORBID, video_glue0_res = AST_RTP_GLUE_RESULT_FORBID;
+ enum ast_rtp_glue_result audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID, video_glue1_res = AST_RTP_GLUE_RESULT_FORBID;
enum ast_bridge_result res = AST_BRIDGE_FAILED;
struct ast_format_cap *cap0 = ast_format_cap_alloc_nolock();
struct ast_format_cap *cap1 = ast_format_cap_alloc_nolock();
@@ -1317,11 +1317,9 @@
audio_glue0_res = glue0->get_rtp_info(c0, &instance0);
video_glue0_res = glue0->get_vrtp_info ? glue0->get_vrtp_info(c0, &vinstance0) : AST_RTP_GLUE_RESULT_FORBID;
- text_glue0_res = glue0->get_trtp_info ? glue0->get_trtp_info(c0, &tinstance0) : AST_RTP_GLUE_RESULT_FORBID;
audio_glue1_res = glue1->get_rtp_info(c1, &instance1);
video_glue1_res = glue1->get_vrtp_info ? glue1->get_vrtp_info(c1, &vinstance1) : AST_RTP_GLUE_RESULT_FORBID;
- text_glue1_res = glue1->get_trtp_info ? glue1->get_trtp_info(c1, &tinstance1) : AST_RTP_GLUE_RESULT_FORBID;
/* If we are carrying video, and both sides are not going to remotely bridge... fail the native bridge */
if (video_glue0_res != AST_RTP_GLUE_RESULT_FORBID && (audio_glue0_res != AST_RTP_GLUE_RESULT_REMOTE || video_glue0_res != AST_RTP_GLUE_RESULT_REMOTE)) {
@@ -1433,8 +1431,8 @@
*vinstance0 = NULL, *vinstance1 = NULL,
*tinstance0 = NULL, *tinstance1 = NULL;
struct ast_rtp_glue *glue0, *glue1;
- enum ast_rtp_glue_result audio_glue0_res = AST_RTP_GLUE_RESULT_FORBID, video_glue0_res = AST_RTP_GLUE_RESULT_FORBID, text_glue0_res = AST_RTP_GLUE_RESULT_FORBID;
- enum ast_rtp_glue_result audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID, video_glue1_res = AST_RTP_GLUE_RESULT_FORBID, text_glue1_res = AST_RTP_GLUE_RESULT_FORBID;
+ enum ast_rtp_glue_result audio_glue0_res = AST_RTP_GLUE_RESULT_FORBID, video_glue0_res = AST_RTP_GLUE_RESULT_FORBID;
+ enum ast_rtp_glue_result audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID, video_glue1_res = AST_RTP_GLUE_RESULT_FORBID;
struct ast_format_cap *cap0 = ast_format_cap_alloc_nolock();
struct ast_format_cap *cap1 = ast_format_cap_alloc_nolock();
int res = 0;
@@ -1459,11 +1457,9 @@
audio_glue0_res = glue0->get_rtp_info(c0, &instance0);
video_glue0_res = glue0->get_vrtp_info ? glue0->get_vrtp_info(c0, &vinstance0) : AST_RTP_GLUE_RESULT_FORBID;
- text_glue0_res = glue0->get_trtp_info ? glue0->get_trtp_info(c0, &tinstance0) : AST_RTP_GLUE_RESULT_FORBID;
audio_glue1_res = glue1->get_rtp_info(c1, &instance1);
video_glue1_res = glue1->get_vrtp_info ? glue1->get_vrtp_info(c1, &vinstance1) : AST_RTP_GLUE_RESULT_FORBID;
- text_glue1_res = glue1->get_trtp_info ? glue1->get_trtp_info(c1, &tinstance1) : AST_RTP_GLUE_RESULT_FORBID;
/* If we are carrying video, and both sides are not going to remotely bridge... fail the native bridge */
if (video_glue0_res != AST_RTP_GLUE_RESULT_FORBID && (audio_glue0_res != AST_RTP_GLUE_RESULT_REMOTE || video_glue0_res != AST_RTP_GLUE_RESULT_REMOTE)) {
@@ -1525,8 +1521,8 @@
*vinstance0 = NULL, *vinstance1 = NULL,
*tinstance0 = NULL, *tinstance1 = NULL;
struct ast_rtp_glue *glue0, *glue1;
[... 243 lines stripped ...]
More information about the svn-commits
mailing list