[asterisk-commits] jpeeler: branch jpeeler/dahdi-restart r137238 - in /team/jpeeler/dahdi-restar...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Aug 11 10:42:29 CDT 2008


Author: jpeeler
Date: Mon Aug 11 10:42:28 2008
New Revision: 137238

URL: http://svn.digium.com/view/asterisk?view=rev&rev=137238
Log:
resolve conflict, turn automerge back on

Modified:
    team/jpeeler/dahdi-restart/   (props changed)
    team/jpeeler/dahdi-restart/UPGRADE.txt
    team/jpeeler/dahdi-restart/apps/app_adsiprog.c
    team/jpeeler/dahdi-restart/apps/app_dahdibarge.c
    team/jpeeler/dahdi-restart/apps/app_dahdiscan.c
    team/jpeeler/dahdi-restart/apps/app_dial.c
    team/jpeeler/dahdi-restart/apps/app_directory.c
    team/jpeeler/dahdi-restart/apps/app_disa.c
    team/jpeeler/dahdi-restart/apps/app_festival.c
    team/jpeeler/dahdi-restart/apps/app_forkcdr.c
    team/jpeeler/dahdi-restart/apps/app_macro.c
    team/jpeeler/dahdi-restart/apps/app_meetme.c
    team/jpeeler/dahdi-restart/apps/app_minivm.c
    team/jpeeler/dahdi-restart/apps/app_osplookup.c
    team/jpeeler/dahdi-restart/apps/app_playback.c
    team/jpeeler/dahdi-restart/apps/app_queue.c
    team/jpeeler/dahdi-restart/apps/app_record.c
    team/jpeeler/dahdi-restart/apps/app_rpt.c
    team/jpeeler/dahdi-restart/apps/app_sms.c
    team/jpeeler/dahdi-restart/apps/app_voicemail.c
    team/jpeeler/dahdi-restart/apps/app_waituntil.c
    team/jpeeler/dahdi-restart/apps/app_while.c
    team/jpeeler/dahdi-restart/cdr/cdr_tds.c
    team/jpeeler/dahdi-restart/channels/chan_agent.c
    team/jpeeler/dahdi-restart/channels/chan_alsa.c
    team/jpeeler/dahdi-restart/channels/chan_console.c
    team/jpeeler/dahdi-restart/channels/chan_dahdi.c
    team/jpeeler/dahdi-restart/channels/chan_features.c
    team/jpeeler/dahdi-restart/channels/chan_iax2.c
    team/jpeeler/dahdi-restart/channels/chan_jingle.c
    team/jpeeler/dahdi-restart/channels/chan_mgcp.c
    team/jpeeler/dahdi-restart/channels/chan_phone.c
    team/jpeeler/dahdi-restart/channels/chan_sip.c
    team/jpeeler/dahdi-restart/channels/chan_skinny.c
    team/jpeeler/dahdi-restart/channels/chan_unistim.c
    team/jpeeler/dahdi-restart/channels/iax2-parser.c
    team/jpeeler/dahdi-restart/channels/xpmr/xpmr.c
    team/jpeeler/dahdi-restart/codecs/codec_dahdi.c
    team/jpeeler/dahdi-restart/include/asterisk/astobj2.h
    team/jpeeler/dahdi-restart/include/asterisk/channel.h
    team/jpeeler/dahdi-restart/include/asterisk/compat.h
    team/jpeeler/dahdi-restart/main/abstract_jb.c
    team/jpeeler/dahdi-restart/main/acl.c
    team/jpeeler/dahdi-restart/main/app.c
    team/jpeeler/dahdi-restart/main/asterisk.c
    team/jpeeler/dahdi-restart/main/astobj2.c
    team/jpeeler/dahdi-restart/main/audiohook.c
    team/jpeeler/dahdi-restart/main/callerid.c
    team/jpeeler/dahdi-restart/main/cdr.c
    team/jpeeler/dahdi-restart/main/channel.c
    team/jpeeler/dahdi-restart/main/cli.c
    team/jpeeler/dahdi-restart/main/config.c
    team/jpeeler/dahdi-restart/main/db1-ast/btree/bt_delete.c
    team/jpeeler/dahdi-restart/main/db1-ast/btree/bt_put.c
    team/jpeeler/dahdi-restart/main/db1-ast/recno/rec_delete.c
    team/jpeeler/dahdi-restart/main/db1-ast/recno/rec_put.c
    team/jpeeler/dahdi-restart/main/event.c
    team/jpeeler/dahdi-restart/main/features.c
    team/jpeeler/dahdi-restart/main/file.c
    team/jpeeler/dahdi-restart/main/frame.c
    team/jpeeler/dahdi-restart/main/http.c
    team/jpeeler/dahdi-restart/main/indications.c
    team/jpeeler/dahdi-restart/main/jitterbuf.c
    team/jpeeler/dahdi-restart/main/logger.c
    team/jpeeler/dahdi-restart/main/manager.c
    team/jpeeler/dahdi-restart/main/pbx.c
    team/jpeeler/dahdi-restart/main/rtp.c
    team/jpeeler/dahdi-restart/main/say.c
    team/jpeeler/dahdi-restart/main/sched.c
    team/jpeeler/dahdi-restart/main/taskprocessor.c
    team/jpeeler/dahdi-restart/main/tdd.c
    team/jpeeler/dahdi-restart/main/udptl.c
    team/jpeeler/dahdi-restart/res/ael/ael.flex
    team/jpeeler/dahdi-restart/res/ael/ael_lex.c
    team/jpeeler/dahdi-restart/res/res_adsi.c
    team/jpeeler/dahdi-restart/res/res_agi.c
    team/jpeeler/dahdi-restart/res/res_config_ldap.c
    team/jpeeler/dahdi-restart/res/res_config_pgsql.c
    team/jpeeler/dahdi-restart/res/res_musiconhold.c
    team/jpeeler/dahdi-restart/res/res_odbc.c
    team/jpeeler/dahdi-restart/res/res_phoneprov.c
    team/jpeeler/dahdi-restart/res/res_smdi.c
    team/jpeeler/dahdi-restart/res/res_timing_pthread.c

Propchange: team/jpeeler/dahdi-restart/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/jpeeler/dahdi-restart/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/jpeeler/dahdi-restart/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 11 10:42:28 2008
@@ -1,1 +1,1 @@
-/trunk:1-136869
+/trunk:1-137237

Modified: team/jpeeler/dahdi-restart/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/UPGRADE.txt?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/UPGRADE.txt (original)
+++ team/jpeeler/dahdi-restart/UPGRADE.txt Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_adsiprog.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_adsiprog.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_adsiprog.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_dahdibarge.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_dahdibarge.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_dahdibarge.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_dahdibarge.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_dahdiscan.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_dahdiscan.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_dahdiscan.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_dahdiscan.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_dial.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_dial.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_dial.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_directory.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_directory.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_directory.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_disa.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_disa.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_disa.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_festival.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_festival.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_festival.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_forkcdr.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_forkcdr.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_forkcdr.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_macro.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_macro.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_macro.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_meetme.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_meetme.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_meetme.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_minivm.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_minivm.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_minivm.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_osplookup.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_osplookup.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_osplookup.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_playback.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_playback.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_playback.c Mon Aug 11 10:42:28 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/jpeeler/dahdi-restart/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/apps/app_queue.c?view=diff&rev=137238&r1=137237&r2=137238
==============================================================================
--- team/jpeeler/dahdi-restart/apps/app_queue.c (original)
+++ team/jpeeler/dahdi-restart/apps/app_queue.c Mon Aug 11 10:42:28 2008
@@ -1056,7 +1056,7 @@
 	char *timestr, *maxstr, *minstr, *contentdup;
 	struct penalty_rule *rule = NULL, *rule_iter;
 	struct rule_list *rl_iter;
-	int time, inserted = 0;
+	int penaltychangetime, inserted = 0;
 
 	if (!(rule = ast_calloc(1, sizeof(*rule)))) {
 		ast_log(LOG_ERROR, "Cannot allocate memory for penaltychange rule at line %d!\n", linenum);
@@ -1074,13 +1074,13 @@
 	*maxstr++ = '\0';
 	timestr = contentdup;
 
-	if ((time = atoi(timestr)) < 0) {
+	if ((penaltychangetime = atoi(timestr)) < 0) {
 		ast_log(LOG_WARNING, "Improper time parameter specified for penaltychange rule at line %d. Ignoring.\n", linenum);
 		ast_free(rule);
 		return -1;
 	}
 
-	rule->time = time;
+	rule->time = penaltychangetime;
 
 	if ((minstr = strchr(maxstr,',')))
 		*minstr++ = '\0';
@@ -1684,7 +1684,7 @@
 	int res = -1;
 	int pos = 0;
 	int inserted = 0;
-	enum queue_member_status stat;
+	enum queue_member_status status;
 
 	if (!(q = load_realtime_queue(queuename)))
 		return res;
@@ -1693,12 +1693,12 @@
 	ao2_lock(q);
 
 	/* This is our one */
-	stat = get_member_status(q, qe->max_penalty, qe->min_penalty);
-	if (!q->joinempty && (stat == QUEUE_NO_MEMBERS))
+	status = get_member_status(q, qe->max_penalty, qe->min_penalty);
+	if (!q->joinempty && (status == QUEUE_NO_MEMBERS))
 		*reason = QUEUE_JOINEMPTY;
-	else if ((q->joinempty == QUEUE_EMPTY_STRICT) && (stat == QUEUE_NO_REACHABLE_MEMBERS || stat == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS || stat == QUEUE_NO_MEMBERS))
+	else if ((q->joinempty == QUEUE_EMPTY_STRICT) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS || status == QUEUE_NO_MEMBERS))
 		*reason = QUEUE_JOINUNAVAIL;
-	else if ((q->joinempty == QUEUE_EMPTY_LOOSE) && (stat == QUEUE_NO_REACHABLE_MEMBERS || stat == QUEUE_NO_MEMBERS))
+	else if ((q->joinempty == QUEUE_EMPTY_LOOSE) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_MEMBERS))
 		*reason = QUEUE_JOINUNAVAIL;
 	else if (q->maxlen && (q->count >= q->maxlen))
 		*reason = QUEUE_FULL;
@@ -1959,7 +1959,7 @@
 static void leave_queue(struct queue_ent *qe)
 {
 	struct call_queue *q;
-	struct queue_ent *cur, *prev = NULL;
+	struct queue_ent *current, *prev = NULL;
 	struct penalty_rule *pr_iter;
 	int pos = 0;
 
@@ -1969,8 +1969,8 @@
 	ao2_lock(q);
 
 	prev = NULL;
-	for (cur = q->head; cur; cur = cur->next) {
-		if (cur == qe) {
+	for (current = q->head; current; current = current->next) {
+		if (current == qe) {
 			q->count--;
 
 			/* Take us out of the queue */
@@ -1980,16 +1980,16 @@
 			ast_debug(1, "Queue '%s' Leave, Channel '%s'\n", q->name, qe->chan->name );
 			/* Take us out of the queue */
 			if (prev)
-				prev->next = cur->next;
+				prev->next = current->next;
 			else
-				q->head = cur->next;
+				q->head = current->next;
 			/* Free penalty rules */
 			while ((pr_iter = AST_LIST_REMOVE_HEAD(&qe->qe_rules, list)))
 				ast_free(pr_iter);
 		} else {
 			/* Renumber the people after us in the queue based on a new count */
-			cur->pos = ++pos;
-			prev = cur;
+			current->pos = ++pos;
+			prev = current;
 		}
 	}
 	ao2_unlock(q);
@@ -2849,7 +2849,7 @@
 
 	/* This is the holding pen for callers 2 through maxlen */
 	for (;;) {
-		enum queue_member_status stat;
+		enum queue_member_status status;
 
 		if (is_our_turn(qe))
 			break;
@@ -2860,10 +2860,10 @@
 			break;
 		}
 
-		stat = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty);
+		status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty);
 
 		/* leave the queue if no agents, if enabled */
-		if (qe->parent->leavewhenempty && (stat == QUEUE_NO_MEMBERS)) {
+		if (qe->parent->leavewhenempty && (status == QUEUE_NO_MEMBERS)) {
 			*reason = QUEUE_LEAVEEMPTY;
 			ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
 			leave_queue(qe);
@@ -2871,13 +2871,13 @@
 		}
 
 		/* leave the queue if no reachable agents, if enabled */
-		if ((qe->parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (stat == QUEUE_NO_REACHABLE_MEMBERS || stat == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS)) {
+		if ((qe->parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS)) {
 			*reason = QUEUE_LEAVEUNAVAIL;
 			ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
 			leave_queue(qe);
 			break;
 		}
-		if ((qe->parent->leavewhenempty == QUEUE_EMPTY_LOOSE) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) {
+		if ((qe->parent->leavewhenempty == QUEUE_EMPTY_LOOSE) && (status == QUEUE_NO_REACHABLE_MEMBERS)) {
 			*reason = QUEUE_LEAVEUNAVAIL;
 			ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
 			leave_queue(qe);
@@ -3204,7 +3204,7 @@
 	struct ast_channel *which;
 	struct callattempt *lpeer;
 	struct member *member;
-	struct ast_app *app;
+	struct ast_app *application;
 	int res = 0, bridge = 0;
 	int numbusies = 0;
 	int x=0;
@@ -3715,10 +3715,10 @@
 				res = -1;
 			}
 			
-			app = pbx_findapp("Macro");
-
-			if (app) {
-				res = pbx_exec(qe->chan, app, macroexec);
+			application = pbx_findapp("Macro");
+
+			if (application) {
+				res = pbx_exec(qe->chan, application, macroexec);
 				ast_debug(1, "Macro exited with status %d\n", res);
 				res = 0;
 			} else {
@@ -3751,9 +3751,9 @@
 				res = -1;
 			}
 			
-			app = pbx_findapp("Gosub");
+			application = pbx_findapp("Gosub");
 			
-			if (app) {
+			if (application) {
 				char *gosub_args, *gosub_argstart;
 
 				/* Set where we came from */
@@ -3770,7 +3770,7 @@
 					asprintf(&gosub_args, "%s,s,1", gosubexec);
 				}
 				if (gosub_args) {
-					res = pbx_exec(qe->chan, app, gosub_args);
+					res = pbx_exec(qe->chan, application, gosub_args);
 					ast_pbx_run(qe->chan);
 					free(gosub_args);
 					if (option_debug)
@@ -3792,10 +3792,10 @@
 
 		if (!ast_strlen_zero(agi)) {
 			ast_debug(1, "app_queue: agi=%s.\n", agi);
-			app = pbx_findapp("agi");
-			if (app) {
+			application = pbx_findapp("agi");
+			if (application) {
 				agiexec = ast_strdupa(agi);
-				ret = pbx_exec(qe->chan, app, agiexec);
+				ret = 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");
 		}
@@ -4704,7 +4704,7 @@
 		/* they may dial a digit from the queue context; */
 		/* or, they may timeout. */
 
-		enum queue_member_status stat;
+		enum queue_member_status status;
 
 		/* Leave if we have exceeded our queuetimeout */
 		if (qe.expire && (time(NULL) > qe.expire)) {
@@ -4749,7 +4749,7 @@
 			goto stop;
 		}
 
-		stat = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty);

[... 11162 lines stripped ...]



More information about the asterisk-commits mailing list