Define the initial values separate from the STATIC definitions

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b031525fb4a418da748c1af91c9cf5dc5d44858b..28bd9a85d79c11e86c23c629ddf72f925ff489a9 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3355,8 +3355,8 @@ static int forward_message(struct ast_channel *chan, char *context, char *dir, i
        char callerid[512];
        char ext_context[256]="";
        int res = 0, cmd = 0;
-       struct ast_vm_user *receiver, *vmtmp;
-       AST_LIST_HEAD_NOLOCK(extension, ast_vm_user) extensions;
+       struct ast_vm_user *receiver = NULL, *vmtmp;
+       AST_LIST_HEAD_NOLOCK_STATIC(extensions, ast_vm_user);
        char tmp[256];
        char *stringp, *s;
        int saved_messages = 0, found = 0;

diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h
index 4f60366d558057cd2330d0ad4c584af2124f6dbe..6cd1f50feba1ee7c62977113b2ef0b0c9588e92f 100644 (file)
--- a/include/asterisk/linkedlists.h
+++ b/include/asterisk/linkedlists.h
@@ -100,6 +100,23 @@ struct name {                                                              \
        struct type *last;                                              \
 }
 
+/*!
+  \brief Defines initial values for a declaration of AST_LIST_HEAD
+*/
+#define AST_LIST_HEAD_INIT_VALUE       {               \
+       .first = NULL,                                  \
+       .last = NULL,                                   \
+       .lock = AST_MUTEX_INIT_VALUE,                   \
+       }
+
+/*!
+  \brief Defines initial values for a declaration of AST_LIST_HEAD_NOLOCK
+*/
+#define AST_LIST_HEAD_NOLOCK_INIT_VALUE        {       \
+       .first = NULL,                                  \
+       .last = NULL,                                   \
+       }
+
 /*!
   \brief Defines a structure to be used to hold a list of specified type, statically initialized.
   \param name This will be the name of the defined structure.
@@ -122,11 +139,7 @@ struct name {                                                              \
        struct type *first;                                             \
        struct type *last;                                              \
        ast_mutex_t lock;                                               \
-} name = {                                                             \
-       .first = NULL,                                                  \
-       .last = NULL,                                                   \
-       .lock = AST_MUTEX_INIT_VALUE,                                   \
-};
+} name = AST_LIST_HEAD_INIT_VALUE;
 
 /*!
   \brief Defines a structure to be used to hold a list of specified type, statically initialized.
@@ -137,10 +150,7 @@ struct name {                                                              \
 struct name {                                                          \
        struct type *first;                                             \
        struct type *last;                                              \
-} name = {                                                             \
-       .first = NULL,                                                  \
-       .last = NULL,                                                   \
-};
+} name = AST_LIST_HEAD_NOLOCK_INIT_VALUE;
 
 /*!
   \brief Initializes a list head structure with a specified first entry.