summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2006-04-11 03:50:17 +0000
committerJoshua Colp <jcolp@digium.com>2006-04-11 03:50:17 +0000
commit0f1321d4231e38c633e58bf40da17f0ab53a5e39 (patch)
treea1e9887ae7d8cda3027ab1b1ce124527f3d0a6b2 /include
parent44b98afdcd91de39c72464471e4d65f8929fbf74 (diff)
Data stores do not need a lock. As well change the way they are removed from the channel when it is destroyed (thanks Russell Wussell) and finally... because C++ is silly... change our list macro info thing to be "entry" instead of "list".
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@19062 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/channel.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 4d1826e6e..7d2b4356f 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -161,7 +161,7 @@ struct ast_datastore {
/*! Data store type information */
const struct ast_datastore_info *info;
/*! Used for easy linking */
- AST_LIST_ENTRY(ast_datastore) list;
+ AST_LIST_ENTRY(ast_datastore) entry;
};
/*! Structure for all kinds of caller ID identifications */
@@ -444,7 +444,7 @@ struct ast_channel {
struct ast_channel_spy_list *spies;
/*! Data stores on the channel */
- AST_LIST_HEAD(datastores, ast_datastore) datastores;
+ AST_LIST_HEAD_NOLOCK(datastores, ast_datastore) datastores;
/*! For easy linking */
AST_LIST_ENTRY(ast_channel) chan_list;