kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Don't check if the list is empty needlessly

Browse Source 
- Don't free structures before calling load_config(), because load_config()
  already does it
- Use the existing functions for freeing the minivm structures instead of
  replicating the code
(issue #9846, patch from eliel)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-05-31 17:56:27 +00:00
parent e8c1a35607
commit 7562efed2d
1 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
apps/app_minivm.c
View File

@@ -2285,11 +2285,9 @@ static void timezone_destroy_list(void)
{ {
struct minivm_zone *this; struct minivm_zone *this;
if (AST_LIST_EMPTY(&minivm_zones))
return;
AST_LIST_LOCK(&minivm_zones); AST_LIST_LOCK(&minivm_zones);
while ((this = AST_LIST_REMOVE_HEAD(&minivm_zones, list))) while ((this = AST_LIST_REMOVE_HEAD(&minivm_zones, list)))
free(this); free_zone(this);
AST_LIST_UNLOCK(&minivm_zones); AST_LIST_UNLOCK(&minivm_zones);
} }
@@ -2462,9 +2460,6 @@ static int apply_general_options(struct ast_variable *var)
/*! \brief Load minivoicemail configuration */ /*! \brief Load minivoicemail configuration */
static int load_config(void) static int load_config(void)
{ {
struct minivm_account *cur;
struct minivm_zone *zcur;
struct minivm_template *tcur;
struct ast_config *cfg; struct ast_config *cfg;
struct ast_variable *var; struct ast_variable *var;
char *cat; char *cat;
@@ -2474,25 +2469,12 @@ static int load_config(void)
cfg = ast_config_load(VOICEMAIL_CONFIG); cfg = ast_config_load(VOICEMAIL_CONFIG);
ast_mutex_lock(&minivmlock); ast_mutex_lock(&minivmlock);
AST_LIST_LOCK(&minivm_accounts); /* Destroy lists to reconfigure */
while ((cur = AST_LIST_REMOVE_HEAD(&minivm_accounts, list))) { message_destroy_list(); /* Destroy list of voicemail message templates */
free_user(cur); timezone_destroy_list(); /* Destroy list of timezones */
} vmaccounts_destroy_list(); /* Destroy list of voicemail accounts */
AST_LIST_UNLOCK(&minivm_accounts); if (option_debug > 1)
ast_log(LOG_DEBUG, "Destroyed memory objects...\n");
/* Free all zones */
AST_LIST_LOCK(&minivm_zones);
while ((zcur = AST_LIST_REMOVE_HEAD(&minivm_zones, list))) {
free_zone(zcur);
}
AST_LIST_UNLOCK(&minivm_zones);
/* Free all templates */
AST_LIST_LOCK(&message_templates);
while ((tcur = AST_LIST_REMOVE_HEAD(&message_templates, list))) {
message_template_free(tcur);
}
AST_LIST_UNLOCK(&message_templates);
/* First, set some default settings */ /* First, set some default settings */
global_externnotify[0] = '\0'; global_externnotify[0] = '\0';
@@ -3186,12 +3168,6 @@ static int load_module(void)
/*! \brief Reload mini voicemail module */ /*! \brief Reload mini voicemail module */
static int reload(void) static int reload(void)
{ {
/* Destroy lists to reconfigure */
message_destroy_list(); /* Destroy list of voicemail message templates */
timezone_destroy_list(); /* Destroy list of timezones */
vmaccounts_destroy_list(); /* Destroy list of voicemail accounts */
if (option_debug > 1)
ast_log(LOG_DEBUG, "Destroyed memory objects...\n");
return(load_config()); return(load_config());
} }