Merged revisions 193870 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r193870 | tilghman | 2009-05-12 12:29:33 -0500 (Tue, 12 May 2009) | 2 lines

  Convert a THREADSTORAGE object into a simple malloc'd object (as suggested by Russell on -dev)
........

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 0c18de2ee1c6d73ee59f8af39900bd5daa93a843..4d62c658fd7bb281d5e12d287189b3a3eb2421c7 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -232,8 +232,6 @@ static AST_LIST_HEAD_STATIC(vmstates, vmstate);
 #define ERROR_LOCK_PATH  -100
 
 
-AST_THREADSTORAGE(voicemail_extension_list);
-
 enum {
        NEW_FOLDER,
        OLD_FOLDER,
@@ -4901,8 +4899,8 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
        char fmt[80];
        char *context;
        char ecodes[17] = "#";
+       struct ast_str *tmp = ast_str_create(16);
        char *tmpptr;
-       struct ast_str *tmp = ast_str_thread_get(&voicemail_extension_list, 16);
        struct ast_vm_user *vmu;
        struct ast_vm_user svm;
        const char *category = NULL;
@@ -4940,6 +4938,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
        if (!(vmu = find_user(&svm, context, ext))) {
                ast_log(AST_LOG_WARNING, "No entry in voicemail config file for '%s'\n", ext);
                pbx_builtin_setvar_helper(chan, "VMSTATUS", "FAILED");
+               ast_free(tmp);
                return res;
        }
        /* Setup pre-file if appropriate */
@@ -4965,6 +4964,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
        snprintf(tempfile, sizeof(tempfile), "%s%s/%s/temp", VM_SPOOL_DIR, vmu->context, ext);
        if ((res = create_dirpath(tmpdir, sizeof(tmpdir), vmu->context, ext, "tmp"))) {
                ast_log(AST_LOG_WARNING, "Failed to make directory (%s)\n", tempfile);
+               ast_free(tmp);
                return -1;
        }
        RETRIEVE(tempfile, -1, vmu->mailbox, vmu->context);
@@ -5035,6 +5035,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
                        ast_debug(1, "Hang up during prefile playback\n");
                        free_user(vmu);
                        pbx_builtin_setvar_helper(chan, "VMSTATUS", "FAILED");
+                       ast_free(tmp);
                        return -1;
                }
        }
@@ -5065,6 +5066,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
                chan->priority = 0;
                free_user(vmu);
                pbx_builtin_setvar_helper(chan, "VMSTATUS", "USEREXIT");
+               ast_free(tmp);
                return 0;
        }
 
@@ -5084,6 +5086,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
                        free_user(vmu);
                        pbx_builtin_setvar_helper(chan, "VMSTATUS", "USEREXIT");
                }
+               ast_free(tmp);
                return 0;
        }
 
@@ -5093,12 +5096,14 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
                        ast_copy_string(chan->context, options->exitcontext, sizeof(chan->context));
                free_user(vmu);
                pbx_builtin_setvar_helper(chan, "VMSTATUS", "USEREXIT");
+               ast_free(tmp);
                return res;
        }
 
        if (res < 0) {
                free_user(vmu);
                pbx_builtin_setvar_helper(chan, "VMSTATUS", "FAILED");
+               ast_free(tmp);
                return -1;
        }
        /* The meat of recording the message...  All the announcements and beeps have been played*/
@@ -5112,6 +5117,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
                res = inboxcount(ext_context, &newmsgs, &oldmsgs);
                if (res < 0) {
                        ast_log(AST_LOG_NOTICE, "Can not leave voicemail, unable to count messages\n");
+                       ast_free(tmp);
                        return -1;
                }
                if (!(vms = get_vm_state_by_mailbox(ext, context, 0))) {
@@ -5121,6 +5127,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
                 */
                        if (!(vms = create_vm_state_from_user(vmu))) {
                                ast_log(AST_LOG_ERROR, "Couldn't allocate necessary space\n");
+                               ast_free(tmp);
                                return -1;
                        }
                }
@@ -5138,6 +5145,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
                if (vms->quota_limit && vms->quota_usage >= vms->quota_limit) {
                        ast_debug(1, "*** QUOTA EXCEEDED!! %u >= %u\n", vms->quota_usage, vms->quota_limit);
                        ast_play_and_wait(chan, "vm-mailboxfull");
+                       ast_free(tmp);
                        return -1;
                }
                
@@ -5145,6 +5153,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
                if (msgnum >= vmu->maxmsg) {
                        ast_log(AST_LOG_WARNING, "Unable to leave message since we will exceed the maximum number of messages allowed (%u > %u)\n", msgnum, vmu->maxmsg);
                        ast_play_and_wait(chan, "vm-mailboxfull");
+                       ast_free(tmp);
                        return -1;
                }
 #else
@@ -5355,7 +5364,8 @@ leave_vm_out:
                ast_mutex_unlock(&vms->lock);
        }
 #endif
-       
+
+       ast_free(tmp);
        return res;
 }