aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_rpt.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-21 19:48:35 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-21 19:48:35 +0000
commit2c104912367e3d3004552ef4549c377d8dc46241 (patch)
treeb1753170eda2f68e28fd260e5934cf7da3c3b0d6 /apps/app_rpt.c
parentf64747900966200b88f8619fa265b934df564df4 (diff)
Merged revisions 43441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43441 | tilghman | 2006-09-21 14:43:32 -0500 (Thu, 21 Sep 2006) | 2 lines Oops, missed the merge breakage ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43442 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_rpt.c')
-rw-r--r--apps/app_rpt.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 328cc2a6b..305e59eb4 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -1886,7 +1886,7 @@ static int get_wait_interval(struct rpt *myrpt, int type)
const char *wait_times;
char *wait_times_save = NULL;
- wait_times = ast_variable_retrieve(cfg, myrpt->name, "wait_times");
+ wait_times = ast_variable_retrieve(myrpt->cfg, myrpt->name, "wait_times");
if (wait_times) {
wait_times_save = ast_strdupa(wait_times);
@@ -1899,28 +1899,28 @@ static int get_wait_interval(struct rpt *myrpt, int type)
switch (type) {
case DLY_TELEM:
if (wait_times)
- interval = retrieve_astcfgint(wait_times_save, "telemwait", 500, 5000, 1000);
+ interval = retrieve_astcfgint(myrpt, wait_times_save, "telemwait", 500, 5000, 1000);
else
interval = 1000;
break;
case DLY_ID:
if (wait_times)
- interval = retrieve_astcfgint(wait_times_save, "idwait", 250, 5000, 500);
+ interval = retrieve_astcfgint(myrpt, wait_times_save, "idwait", 250, 5000, 500);
else
interval = 500;
break;
case DLY_UNKEY:
if (wait_times)
- interval = retrieve_astcfgint(wait_times_save, "unkeywait", 500, 5000, 1000);
+ interval = retrieve_astcfgint(myrpt, wait_times_save, "unkeywait", 500, 5000, 1000);
else
interval = 1000;
break;
case DLY_CALLTERM:
if (wait_times)
- interval = retrieve_astcfgint(wait_times_save, "calltermwait", 500, 5000, 1500);
+ interval = retrieve_astcfgint(myrpt, wait_times_save, "calltermwait", 500, 5000, 1500);
else
interval = 1500;
break;
@@ -1929,7 +1929,7 @@ static int get_wait_interval(struct rpt *myrpt, int type)
return 0;
}
return interval;
-}
+}
/*