[svn-commits] branch bweschke/findme_followme r31867 - /team/bweschke/findme_followme/apps/

[svn-commits at lists.digium.com]

Author: bweschke
Date: Sat Jun  3 18:06:04 2006
New Revision: 31867

URL: http://svn.digium.com/view/asterisk?rev=31867&view=rev
Log:
 Fix return values to all return NULL when there isn't a 'winner'.


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=31867&r1=31866&r2=31867&view=diff
==============================================================================
--- team/bweschke/findme_followme/apps/app_followme.c (original)
+++ team/bweschke/findme_followme/apps/app_followme.c Sat Jun  3 18:06:04 2006
@@ -388,7 +388,7 @@
 				ast_verbose(VERBOSE_PREFIX_3 "Original caller hungup. Cleanup.\n");
 			clear_calling_tree(findme_user_list);
 			free(to);
-			return 0;
+			return NULL;
 		}
 		ctstatus = 0;
 		totalwait = nm->timeout * 1000;
@@ -465,7 +465,7 @@
 					ast_verbose(VERBOSE_PREFIX_3 "We've hit our timeout for this step. Drop everyone and move on to the next one. %ld\n", totalwait);
 				clear_calling_tree(findme_user_list);
 				free(to);
-				return 0;
+				return NULL;
 			}
 			if (winner) {
 				/* Need to find out which channel this is */
@@ -579,28 +579,28 @@
 									ast_log(LOG_DEBUG, "Next in dial plan step requested.\n");
 								*status = 1;
 								free(to);
-								return 0;
+								return NULL;
 							}	
 							if (!strcmp(tmpuser->yn, nextinfmfm)) {
 								if (option_debug)
 									ast_log(LOG_DEBUG, "Next in find me/follow me step requested.\n");
 								*status = 2;
 								free(to);
-								return 0;
+								return NULL;
 							}	
 							if (!strcmp(tmpuser->yn, blindxferexten)) {
 								if (option_debug)
 									ast_log(LOG_DEBUG, "Blind Transfer requested.\n");
 								*status = 3;
 								free(to);
-								return 0;
+								return NULL;
 							}	
 							if (!strcmp(tmpuser->yn, atxferexten)) {
 								if (option_debug)
 									ast_log(LOG_DEBUG, "Attended Transfer requested.\n");
 								*status = 4;
 								free(to);
-								return 0;
+								return NULL;
 							}	
 
 						}
@@ -614,7 +614,7 @@
 						if (!dg) {
 							clear_calling_tree(findme_user_list);
 							free(to);
-							return 0;
+							return NULL;
 						} else {
 							tmpuser->state = -1;
 						 	ast_hangup(winner);  
@@ -625,7 +625,7 @@
 								if (option_verbose > 2)
 									ast_verbose(VERBOSE_PREFIX_3 "no live channels left. exiting.\n");
 								free(to);
-								return 0;
+								return NULL;
 							}
 						}
 					}