[asterisk-commits] trunk r9800 - in /trunk: apps/ funcs/ include/asterisk/ pbx/

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Feb 13 14:12:50 2006
New Revision: 9800

URL: http://svn.digium.com/view/asterisk?rev=9800&view=rev
Log:
remove LOCAL_USER_ACF_ADD since it is now the same as LOCAL_USER_ADD

Modified:
    trunk/apps/app_curl.c
    trunk/apps/app_hasnewvoicemail.c
    trunk/apps/app_queue.c
    trunk/funcs/func_cut.c
    trunk/funcs/func_enum.c
    trunk/funcs/func_rand.c
    trunk/include/asterisk/module.h
    trunk/pbx/pbx_dundi.c

Modified: trunk/apps/app_curl.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_curl.c?rev=9800&r1=9799&r2=9800&view=diff
==============================================================================
--- trunk/apps/app_curl.c (original)
+++ trunk/apps/app_curl.c Mon Feb 13 14:12:50 2006
@@ -125,7 +125,7 @@
 		return -1;
 	}
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	AST_STANDARD_APP_ARGS(args, info);	
 	

Modified: trunk/apps/app_hasnewvoicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_hasnewvoicemail.c?rev=9800&r1=9799&r2=9800&view=diff
==============================================================================
--- trunk/apps/app_hasnewvoicemail.c (original)
+++ trunk/apps/app_hasnewvoicemail.c Mon Feb 13 14:12:50 2006
@@ -187,7 +187,7 @@
 		AST_APP_ARG(folder);
 	);
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	buf[0] = '\0';
 

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=9800&r1=9799&r2=9800&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Mon Feb 13 14:12:50 2006
@@ -3156,7 +3156,7 @@
 		return -1;
 	}
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 	
 	AST_LIST_LOCK(&queues);
 
@@ -3199,7 +3199,7 @@
 		return -1;
 	}
 	
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	AST_LIST_LOCK(&queues);
 

Modified: trunk/funcs/func_cut.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_cut.c?rev=9800&r1=9799&r2=9800&view=diff
==============================================================================
--- trunk/funcs/func_cut.c (original)
+++ trunk/funcs/func_cut.c Mon Feb 13 14:12:50 2006
@@ -233,7 +233,7 @@
 	struct localuser *u;
 	int ret = -1;
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	switch (sort_internal(chan, data, buf, len)) {
 	case ERROR_NOARG:
@@ -258,7 +258,7 @@
 	int ret = -1;
 	struct localuser *u;
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	switch (cut_internal(chan, data, buf, len)) {
 	case ERROR_NOARG:

Modified: trunk/funcs/func_enum.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_enum.c?rev=9800&r1=9799&r2=9800&view=diff
==============================================================================
--- trunk/funcs/func_enum.c (original)
+++ trunk/funcs/func_enum.c Mon Feb 13 14:12:50 2006
@@ -99,7 +99,7 @@
 	}
 	*p = '\0';
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	res = ast_get_enum(chan, p, dest, sizeof(dest), tech, sizeof(tech), args.zone,
 			   args.options);
@@ -141,7 +141,7 @@
 
 	buf[0] = '\0';
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "TXTCIDNAME requires an argument (number)\n");

Modified: trunk/funcs/func_rand.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_rand.c?rev=9800&r1=9799&r2=9800&view=diff
==============================================================================
--- trunk/funcs/func_rand.c (original)
+++ trunk/funcs/func_rand.c Mon Feb 13 14:12:50 2006
@@ -53,7 +53,7 @@
 			     AST_APP_ARG(max);
 	);
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	AST_STANDARD_APP_ARGS(args, parse);
 

Modified: trunk/include/asterisk/module.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/module.h?rev=9800&r1=9799&r2=9800&view=diff
==============================================================================
--- trunk/include/asterisk/module.h (original)
+++ trunk/include/asterisk/module.h Mon Feb 13 14:12:50 2006
@@ -318,21 +318,6 @@
  * it will cause your function to return -1 to the caller.
  */
 #define LOCAL_USER_ADD(u) { \
- \
-	if (!(u=calloc(1,sizeof(*u)))) { \
-		ast_log(LOG_WARNING, "Out of memory\n"); \
-		return -1; \
-	} \
-	ast_mutex_lock(&localuser_lock); \
-	u->chan = chan; \
-	u->next = localusers; \
-	localusers = u; \
-	localusecnt++; \
-	ast_mutex_unlock(&localuser_lock); \
-	ast_update_use_count(); \
-}
-
-#define LOCAL_USER_ACF_ADD(u) { \
  \
 	if (!(u=calloc(1,sizeof(*u)))) { \
 		ast_log(LOG_WARNING, "Out of memory\n"); \

Modified: trunk/pbx/pbx_dundi.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_dundi.c?rev=9800&r1=9799&r2=9800&view=diff
==============================================================================
--- trunk/pbx/pbx_dundi.c (original)
+++ trunk/pbx/pbx_dundi.c Mon Feb 13 14:12:50 2006
@@ -3847,7 +3847,7 @@
 	struct localuser *u;
 	struct dundi_result dr[MAX_RESULTS];
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	buf[0] = '\0';