From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 12 Mar 2008 17:06:37 +0000 (+0000)
Subject:  - Add Tilghman to the copyright info ... he wrote the hard part :)
X-Git-Tag: 1.6.0-beta7~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4110872753759c624c83105cd0d34bc48251979;p=thirdparty%2Fasterisk.git

 - 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
---

diff --git a/funcs/func_config.c b/funcs/func_config.c
index ecf281c9d9..33f822b4ac 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;
 }