From e941bbad0fe6511dd92c4a1341a248eae681691b Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Thu, 13 Dec 2007 20:23:48 +0000
Subject: [PATCH] Move usage of the old LOCAL_USER_* macros to the new
ast_module_user_* functions in a few documentation places. (closes issue
#11533) Reported by: IgorG Patches: oldmacroclean.v1.diff uploaded by
IgorG (license 20)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_rpt.c | 4 ----
include/asterisk/app.h | 2 +-
include/asterisk/module.h | 2 +-
res/res_agi.c | 2 +-
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 4bca3e07bc..e7fbc81457 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -287,10 +287,6 @@ char *discstr = "!!DISCONNECT!!";
static char *remote_rig_ft897 = "ft897";
static char *remote_rig_rbi = "rbi";
-#ifdef OLD_ASTERISK
-STANDARD_LOCAL_USER;
-#endif
-
#define MSWAIT 200
#define HANGTIME 5000
#define TOTIME 180000
diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index 26523d4bd8..306ae47c23 100644
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -394,7 +394,7 @@ struct ast_app_option {
... do any argument parsing here ...
if (ast_parseoptions(my_app_options, &opts, opt_args, options)) {
- LOCAL_USER_REMOVE(u);
+ ast_module_user_remove(u);
return -1;
}
}
diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index 1b257ed157..ac0fe5dd4e 100644
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -97,7 +97,7 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode);
* This function calulates use counts and notifies anyone trying to keep track
* of them. It should be called whenever your module's usecount changes.
*
- * \note The LOCAL_USER macros take care of calling this function for you.
+ * \note The ast_module_user_* functions take care of calling this function for you.
*/
void ast_update_use_count(void);
diff --git a/res/res_agi.c b/res/res_agi.c
index cf84bb9c38..77e56f5f2c 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -2457,7 +2457,7 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int
/* Answer if need be */
if (chan->_state != AST_STATE_UP) {
if (ast_answer(chan)) {
- LOCAL_USER_REMOVE(u);
+ ast_module_user_remove(u);
return -1;
}
}
--
GitLab