- The recent change to linklists.h broke the build on linux for some reason.

   So, I have removed all of the uses of AST_LIST_HEAD_INIT and replaced them
   with the equivalent static initializations.
 - On passing, fix a memory leak in the unload_module() function of chan_agent.
   The agents list mutex was never destroyed, and the elements in the agents
   list were not freed.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26990 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index ecc8bf88895077bc04614d470f4a76688e2f8c07..e29a3655ecfb7abcd9f4a83d7c9d06d8c59add91 100644 (file)
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -258,14 +258,14 @@ static int app_exec(struct ast_channel *chan, void *data)
        FILE *child_commands = NULL;
        FILE *child_errors = NULL;
        FILE *child_events = NULL;
-       struct ivr_localuser foo, *u = &foo;
-
-       bzero(u, sizeof(*u));
+       struct ivr_localuser foo = {
+               .playlist = AST_LIST_HEAD_INIT_VALUE,
+               .finishlist = AST_LIST_HEAD_INIT_VALUE,
+       };
+       struct ivr_localuser *u = &foo;
 
        LOCAL_USER_ADD(lu);
        
-       AST_LIST_HEAD_INIT(&u->playlist);
-       AST_LIST_HEAD_INIT(&u->finishlist);
        u->abort_current_sound = 0;
        u->chan = chan;
        

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index c62eaf6d346a4b11179b801293eefce45c47aac0..94c9cc64cd669049f22dfeca777069aa61995401 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -2597,19 +2597,16 @@ static int unload_module(void *mod)
        ast_manager_unregister("AgentLogoff");
        ast_manager_unregister("AgentCallbackLogin");
        /* Unregister channel */
-       ast_channel_unregister(&agent_tech);
-       if (!AST_LIST_LOCK(&agents)) {
-               /* Hangup all interfaces if they have an owner */
-               AST_LIST_TRAVERSE(&agents, p, list) {
-                       if (p->owner)
-                               ast_softhangup(p->owner, AST_SOFTHANGUP_APPUNLOAD);
-               }
-               AST_LIST_UNLOCK(&agents);
-               AST_LIST_HEAD_INIT(&agents);
-       } else {
-               ast_log(LOG_WARNING, "Unable to lock the monitor\n");
-               return -1;
-       }               
+       AST_LIST_LOCK(&agents);
+       /* Hangup all interfaces if they have an owner */
+       while ((p = AST_LIST_REMOVE_HEAD(&agents, list))) {
+               if (p->owner)
+                       ast_softhangup(p->owner, AST_SOFTHANGUP_APPUNLOAD);
+               free(p);
+       }
+       AST_LIST_UNLOCK(&agents);
+       AST_LIST_HEAD_DESTROY(&agents);
+
        return 0;
 }
 

diff --git a/dnsmgr.c b/dnsmgr.c
index fac0c8dafcc3753afe96331b226ff307e681e2e7..8e7f76453693f7cb695baab5c54fb16689979fe8 100644 (file)
--- a/dnsmgr.c
+++ b/dnsmgr.c
@@ -58,7 +58,7 @@ struct ast_dnsmgr_entry {
        char name[1];
 };
 
-static AST_LIST_HEAD(entry_list, ast_dnsmgr_entry) entry_list;
+static AST_LIST_HEAD_STATIC(entry_list, ast_dnsmgr_entry);
 
 AST_MUTEX_DEFINE_STATIC(refresh_lock);
 
@@ -285,7 +285,6 @@ int dnsmgr_init(void)
                ast_log(LOG_ERROR, "Unable to create schedule context.\n");
                return -1;
        }
-       AST_LIST_HEAD_INIT(&entry_list);
        ast_cli_register(&cli_reload);
        ast_cli_register(&cli_status);
        return do_reload(1);

diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h
index 48f13a9715c99d33221efae3c834f783e64593ba..9441cf63f17d0ec271d998af3550ee24dcb72b3a 100644 (file)
--- a/include/asterisk/linkedlists.h
+++ b/include/asterisk/linkedlists.h
@@ -353,20 +353,6 @@ struct {                                                           \
  */
 #define AST_LIST_TRAVERSE_SAFE_END  }
 
-/*!
-  \brief Initializes a list head structure.
-  \param head This is a pointer to the list head structure
-
-  This macro initializes a list head structure by setting the head
-  entry to \a NULL (empty list) and recreating the embedded lock.
-*/
-#define AST_LIST_HEAD_INIT(head) {                                     \
-       (head)->first = NULL;                                           \
-       (head)->last = NULL;                                            \
-       (head)->lock = AST_MUTEX_INIT_VALUE;                            \
-       ast_mutex_init(&(head)->lock);                                  \
-}
-
 /*!
   \brief Destroys a list head structure.
   \param head This is a pointer to the list head structure

diff --git a/pbx.c b/pbx.c
index c5367943a35eeb50d42a56416ebc336f4f5309ab..1a5f6f4c449397a9fb1914bb6c068e1ef36fa0c0 100644 (file)
--- a/pbx.c
+++ b/pbx.c
@@ -3465,15 +3465,13 @@ AST_LIST_HEAD(store_hints, store_hint);
 void ast_merge_contexts_and_delete(struct ast_context **extcontexts, const char *registrar)
 {
        struct ast_context *tmp, *lasttmp = NULL;
-       struct store_hints store;
+       struct store_hints store = AST_LIST_HEAD_INIT_VALUE;
        struct store_hint *this;
        struct ast_hint *hint;
        struct ast_exten *exten;
        int length;
        struct ast_state_cb *thiscb, *prevcb;
 
-       AST_LIST_HEAD_INIT(&store);
-
        /* it is very important that this function hold the hint list lock _and_ the conlock
           during its operation; not only do we need to ensure that the list of contexts
           and extensions does not change, but also that no hint callbacks (watchers) are

diff --git a/res/res_features.c b/res/res_features.c
index c5dfbcfa6f038e917a550f5349e4f165ff684e15..c523f881116b4455e8da0f561e0bdfa09e066b93 100644 (file)
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -782,7 +782,7 @@ struct ast_call_feature builtin_features[] =
 };
 
 
-static AST_LIST_HEAD(feature_list,ast_call_feature) feature_list;
+static AST_LIST_HEAD_STATIC(feature_list,ast_call_feature);
 
 /*! \brief register new feature into feature_list*/
 void ast_register_feature(struct ast_call_feature *feature)
@@ -2104,7 +2104,6 @@ static int load_module(void *mod)
        int res;
        
        __mod_desc = mod;
-       AST_LIST_HEAD_INIT(&feature_list);
        memset(parking_ext, 0, sizeof(parking_ext));
        memset(parking_con, 0, sizeof(parking_con));