[asterisk-commits] branch bweschke/findme_followme r31810 - /team/bweschke/findme_followme/apps/

[asterisk-commits at lists.digium.com]

Author: bweschke
Date: Sat Jun  3 13:56:11 2006
New Revision: 31810

URL: http://svn.digium.com/view/asterisk?rev=31810&view=rev
Log:
 Ok. It compiles now. (thanks kpfleming!)


Modified:
    team/bweschke/findme_followme/apps/app_followme.c

Modified: team/bweschke/findme_followme/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/findme_followme/apps/app_followme.c?rev=31810&r1=31809&r2=31810&view=diff
==============================================================================
--- team/bweschke/findme_followme/apps/app_followme.c (original)
+++ team/bweschke/findme_followme/apps/app_followme.c Sat Jun  3 13:56:11 2006
@@ -328,18 +328,18 @@
 
 }
 
-static void clear_calling_tree(findme_user_listptr findme_user_list) 
+static void clear_calling_tree(struct findme_user_listptr *findme_user_list) 
 {
 	struct findme_user *tmpuser = NULL;
 	
-	AST_LIST_TRAVERSE(&findme_user_list, tmpuser, entry) 		
+	AST_LIST_TRAVERSE(findme_user_list, tmpuser, entry) 		
 		clear_caller(tmpuser);
 	
 }
 
 
 
-static struct ast_channel *wait_for_winner(findme_user_listptr findme_user_list, struct number *nm, struct ast_channel *caller, char *namerecloc, int *status) 
+static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_user_list, struct number *nm, struct ast_channel *caller, char *namerecloc, int *status) 
 {
 	struct ast_channel *watchers[256];
 	int pos;
@@ -360,7 +360,7 @@
 	callfromname = ast_strdupa("call-from");
 	pressbuttonname = ast_strdupa("press-1-to-be-connected-or");	
 
-	if (!AST_LIST_EMPTY(&findme_user_list))
+	if (!AST_LIST_EMPTY(findme_user_list))
 	{
 		if (!caller) {
 			ast_log(LOG_NOTICE, "Original caller hungup. Cleanup.\n");
@@ -378,7 +378,7 @@
 		
 			dg = 0;	
 			winner = NULL;	
-			AST_LIST_TRAVERSE(&findme_user_list, tmpuser, entry) {
+			AST_LIST_TRAVERSE(findme_user_list, tmpuser, entry) {
 				if (tmpuser->state >= 0 && tmpuser->ochan) {
 					if (tmpuser->digts && (tmpuser->digts - totalwait) > featuredigittimeout) {
 						ast_log(LOG_NOTICE, "We've been waiting for digits longer than we should have.\n");
@@ -445,7 +445,7 @@
 				dg = 0;
 				while ((winner != watchers[dg]) && (dg < 256))
 					dg++;
-				AST_LIST_TRAVERSE(&findme_user_list, tmpuser, entry) {
+				AST_LIST_TRAVERSE(findme_user_list, tmpuser, entry) {
 					if (tmpuser->ochan == winner)
 						break;
 				}
@@ -621,10 +621,10 @@
 	struct findme_user *tmpuser = NULL;
 	struct findme_user *fmuser = NULL;
 	struct findme_user *headuser = NULL;
-	struct findme_user_listptr findme_user_list;
+	struct findme_user_listptr *findme_user_list;
 	int status;
 	
-	AST_LIST_HEAD_INIT_NOLOCK(&findme_user_list);
+	AST_LIST_HEAD_INIT_NOLOCK(findme_user_list);
 
 	tpargs = (struct fm_args *)args;
 			
@@ -634,20 +634,20 @@
 
 	/* We're going to figure out what the longest possible string of digits to collect is */
 	ynlongest = 0;
-	if (strlen((void *)&takecall) > ynlongest)
-		ynlongest = strlen((void *)&takecall);
-	if (strlen((void *)&nextindp) > ynlongest)
-		ynlongest = strlen((void *)&nextindp);
-	if (strlen((void *)&nextinfmfm) > ynlongest)
-		ynlongest = strlen((void *)&nextinfmfm);
-	if (strlen((void *)&blindxferexten) > ynlongest)
-		ynlongest = strlen((void *)&blindxferexten);
-	if (strlen((void *)&atxferexten) > ynlongest)
-		ynlongest = strlen((void *)&atxferexten);
+	if (strlen(takecall) > ynlongest)
+		ynlongest = strlen(takecall);
+	if (strlen(nextindp) > ynlongest)
+		ynlongest = strlen(nextindp);
+	if (strlen(nextinfmfm) > ynlongest)
+		ynlongest = strlen(nextinfmfm);
+	if (strlen(blindxferexten) > ynlongest)
+		ynlongest = strlen(blindxferexten);
+	if (strlen(atxferexten) > ynlongest)
+		ynlongest = strlen(atxferexten);
 
 
 	caller = tpargs->chan;
-	AST_LIST_TRAVERSE(&tpargs.cnumbers, nm, entry) {
+	AST_LIST_TRAVERSE(&tpargs->cnumbers, nm, entry) {
 		if (option_debug > 2)	
 			ast_log(LOG_DEBUG, "Number %s timeout %ld\n",nm->number,nm->timeout);
 		time(&start_time);
@@ -681,7 +681,7 @@
 					tmpuser->ochan = outbound;
 					tmpuser->state = 0;
 					ast_copy_string(tmpuser->dialarg, dialarg, sizeof(dialarg));
-					AST_LIST_INSERT_TAIL(&findme_user_list, tmpuser, entry);
+					AST_LIST_INSERT_TAIL(findme_user_list, tmpuser, entry);
 				} else { 
 					ast_log(LOG_NOTICE, "couldn't reach at this number.\n"); 
 					if (outbound) {
@@ -714,14 +714,14 @@
 		} while (number);
 				
 		status = 0;	
-		if (!AST_LIST_EMPTY(&findme_user_list))
-			winner = wait_for_winner(headuser, nm, caller, tpargs->namerecloc, &status);
+		if (!AST_LIST_EMPTY(findme_user_list))
+			winner = wait_for_winner(findme_user_list, nm, caller, tpargs->namerecloc, &status);
 		
 					
-		AST_LIST_TRAVERSE_SAFE_BEGIN(&findme_user_list, fmuser, entry) {
+		AST_LIST_TRAVERSE_SAFE_BEGIN(findme_user_list, fmuser, entry) {
 			if (fmuser->ochan != winner)
 				clear_caller(fmuser);
-			AST_LIST_REMOVE_CURRENT(&findme_user_list, entry);
+			AST_LIST_REMOVE_CURRENT(findme_user_list, entry);
 			free(fmuser);
 		}
 		AST_LIST_TRAVERSE_SAFE_END