diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-03-12 17:06:37 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-03-12 17:06:37 +0000 |
| commit | d4110872753759c624c83105cd0d34bc48251979 (patch) | |
| tree | 477ce023154c114406bca849ae8092ba82dfcad2 /funcs/func_config.c | |
| parent | f7e28b12fe4f8259d6c3f2ee0088c912a89d404e (diff) | |
- Add Tilghman to the copyright info ... he wrote the hard part :)
- Remove some magic in unload_module that isn't needed. Module use counts
already ensure that the function isn't going to be in use at this point.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@108034 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_config.c')
| -rw-r--r-- | funcs/func_config.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/funcs/func_config.c b/funcs/func_config.c index ecf281c9d..33f822b4a 100644 --- a/funcs/func_config.c +++ b/funcs/func_config.c @@ -4,6 +4,7 @@ * Copyright (C) 2008, Digium, Inc. * * Russell Bryant <russell@digium.com> + * Tilghman Lesher <func_config__200803@the-tilghman.com> * * See http://www.asterisk.org for more information about * the Asterisk project. Please do not directly contact @@ -21,6 +22,7 @@ * \brief A function to retrieve variables from an Asterisk configuration file * * \author Russell Bryant <russell@digium.com> + * \author Tilghman Lesher <func_config__200803@the-tilghman.com> * * \ingroup functions */ @@ -170,20 +172,13 @@ static int unload_module(void) struct config_item *cur; int res = ast_custom_function_unregister(&config_function); - /* Allow anything already in the routine to exit */ - usleep(1); AST_RWLIST_WRLOCK(&configs); - usleep(1); - AST_RWLIST_UNLOCK(&configs); - /* Even if it needed to upgrade a lock */ - usleep(1); - AST_RWLIST_WRLOCK(&configs); - /* At this point, no other thread should be queued inside this module */ while ((cur = AST_RWLIST_REMOVE_HEAD(&configs, entry))) { ast_config_destroy(cur->cfg); ast_free(cur); } AST_RWLIST_UNLOCK(&configs); + return res; } |