kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

CID:1025868 Simplified a function arguments never called.

This commit is contained in:
Marc Olivier Chouinard 2014-05-16 17:03:59 -04:00
parent e1f8e199f0
commit 8fa7398760
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mod/applications/mod_callcenter/mod_callcenter.c
View File

@ -474,7 +474,7 @@ static void queue_rwunlock(cc_queue_t *queue)
} }
} }
static void destroy_queue(const char *queue_name, switch_bool_t block) static void destroy_queue(const char *queue_name)
{ {
cc_queue_t *queue = NULL; cc_queue_t *queue = NULL;
switch_mutex_lock(globals.mutex); switch_mutex_lock(globals.mutex);
@ -488,17 +488,12 @@ static void destroy_queue(const char *queue_name, switch_bool_t block)
return; return;
} }
if (block) { if (switch_thread_rwlock_trywrlock(queue->rwlock) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[%s] Waiting for write lock\n", queue->name); /* Lock failed, set the destroy flag so it'll be destroyed whenever its not in use anymore */
switch_thread_rwlock_wrlock(queue->rwlock); switch_set_flag(queue, PFLAG_DESTROY);
} else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[%s] queue is in use, memory will be freed whenever its no longer in use\n",
if (switch_thread_rwlock_trywrlock(queue->rwlock) != SWITCH_STATUS_SUCCESS) { queue->name);
/* Lock failed, set the destroy flag so it'll be destroyed whenever its not in use anymore */ return;
switch_set_flag(queue, PFLAG_DESTROY);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[%s] queue is in use, memory will be freed whenever its no longer in use\n",
queue->name);
return;
}
} }
free_queue(queue); free_queue(queue);
@ -3171,7 +3166,7 @@ SWITCH_STANDARD_API(cc_config_api_function)
goto done; goto done;
} else { } else {
const char *queue_name = argv[0 + initial_argc]; const char *queue_name = argv[0 + initial_argc];
destroy_queue(queue_name, SWITCH_FALSE); destroy_queue(queue_name);
stream->write_function(stream, "%s", "+OK\n"); stream->write_function(stream, "%s", "+OK\n");
} }
@ -3183,7 +3178,7 @@ SWITCH_STANDARD_API(cc_config_api_function)
} else { } else {
const char *queue_name = argv[0 + initial_argc]; const char *queue_name = argv[0 + initial_argc];
cc_queue_t *queue = NULL; cc_queue_t *queue = NULL;
destroy_queue(queue_name, SWITCH_FALSE); destroy_queue(queue_name);
if ((queue = get_queue(queue_name))) { if ((queue = get_queue(queue_name))) {
queue_rwunlock(queue); queue_rwunlock(queue);
stream->write_function(stream, "%s", "+OK\n"); stream->write_function(stream, "%s", "+OK\n");