kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

cleanup, null checks. etc.

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6695 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-12-12 03:21:14 +00:00
parent 98fa287c57
commit 8fd67f8779
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -456,7 +456,7 @@ SWITCH_STANDARD_APP(set_global_function)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n");
} else { } else {
var = strdup(data); var = strdup(data);
assert(var); switch_assert(var);
val = strchr(var, '='); val = strchr(var, '=');
if (val) { if (val) {

2
src/mod/applications/mod_expr/mod_expr.c
View File

@ -61,7 +61,7 @@ SWITCH_STANDARD_API(expr_function)
m_cmd = malloc(len); m_cmd = malloc(len);
assert(m_cmd); switch_assert(m_cmd);
switch_copy_string(m_cmd, cmd, len); switch_copy_string(m_cmd, cmd, len);
for (p = m_cmd; p && *p; p++) { for (p = m_cmd; p && *p; p++) {

24
src/mod/applications/mod_fifo/mod_fifo.c
View File

@ -124,7 +124,7 @@ SWITCH_STANDARD_APP(fifo_function)
} }
mydata = switch_core_session_strdup(session, data); mydata = switch_core_session_strdup(session, data);
assert(mydata); switch_assert(mydata);
if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 2) { if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 2) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
return; return;
@ -137,7 +137,7 @@ SWITCH_STANDARD_APP(fifo_function)
switch_queue_create(&node->fifo, SWITCH_CORE_QUEUE_LEN, globals.pool); switch_queue_create(&node->fifo, SWITCH_CORE_QUEUE_LEN, globals.pool);
switch_core_hash_init(&node->caller_hash, globals.pool); switch_core_hash_init(&node->caller_hash, globals.pool);
switch_core_hash_init(&node->consumer_hash, globals.pool); switch_core_hash_init(&node->consumer_hash, globals.pool);
assert(node->fifo); switch_assert(node->fifo);
switch_mutex_init(&node->mutex, SWITCH_MUTEX_NESTED, globals.pool); switch_mutex_init(&node->mutex, SWITCH_MUTEX_NESTED, globals.pool);
switch_core_hash_insert(globals.fifo_hash, argv[0], node); switch_core_hash_insert(globals.fifo_hash, argv[0], node);
} }
@ -337,12 +337,12 @@ SWITCH_STANDARD_APP(fifo_function)
switch_channel_answer(channel); switch_channel_answer(channel);
cloned_profile = switch_caller_profile_clone(other_session, switch_channel_get_caller_profile(channel)); cloned_profile = switch_caller_profile_clone(other_session, switch_channel_get_caller_profile(channel));
assert(cloned_profile); switch_assert(cloned_profile);
switch_channel_set_originator_caller_profile(other_channel, cloned_profile); switch_channel_set_originator_caller_profile(other_channel, cloned_profile);
cloned_profile = switch_caller_profile_clone(session, switch_channel_get_caller_profile(other_channel)); cloned_profile = switch_caller_profile_clone(session, switch_channel_get_caller_profile(other_channel));
assert(cloned_profile); switch_assert(cloned_profile);
assert(cloned_profile->next == NULL); switch_assert(cloned_profile->next == NULL);
switch_channel_set_originatee_caller_profile(channel, cloned_profile); switch_channel_set_originatee_caller_profile(channel, cloned_profile);
ts = switch_timestamp_now(); ts = switch_timestamp_now();
@ -414,7 +414,7 @@ static int xml_hash(switch_xml_t xml, switch_hash_t *hash, char *container, char
const void *var; const void *var;
x_tmp = switch_xml_add_child_d(xml, container, cc_off++); x_tmp = switch_xml_add_child_d(xml, container, cc_off++);
assert(x_tmp); switch_assert(x_tmp);
for (hi = switch_hash_first(NULL, hash); hi; hi = switch_hash_next(hi)) { for (hi = switch_hash_first(NULL, hash); hi; hi = switch_hash_next(hi)) {
int c_off = 0, d_off = 0; int c_off = 0, d_off = 0;
@ -425,7 +425,7 @@ static int xml_hash(switch_xml_t xml, switch_hash_t *hash, char *container, char
session = (switch_core_session_t *) val; session = (switch_core_session_t *) val;
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
x_caller = switch_xml_add_child_d(x_tmp, tag, c_off++); x_caller = switch_xml_add_child_d(x_tmp, tag, c_off++);
assert(x_caller); switch_assert(x_caller);
switch_xml_set_attr_d(x_caller, "uuid", switch_core_session_get_uuid(session)); switch_xml_set_attr_d(x_caller, "uuid", switch_core_session_get_uuid(session));
@ -468,7 +468,7 @@ static void list_node(fifo_node_t *node, switch_xml_t x_report, int *off, int ve
char *tmp = buffer; char *tmp = buffer;
x_fifo = switch_xml_add_child_d(x_report, "fifo", (*off)++);; x_fifo = switch_xml_add_child_d(x_report, "fifo", (*off)++);;
assert(x_fifo); switch_assert(x_fifo);
switch_xml_set_attr_d(x_fifo, "name", node->name); switch_xml_set_attr_d(x_fifo, "name", node->name);
snprintf(tmp, sizeof(buffer), "%d", node->consumer_count); snprintf(tmp, sizeof(buffer), "%d", node->consumer_count);
@ -496,10 +496,10 @@ SWITCH_STANDARD_API(fifo_api_function)
if (!switch_strlen_zero(cmd)) { if (!switch_strlen_zero(cmd)) {
data = strdup(cmd); data = strdup(cmd);
assert(data); switch_assert(data);
} }
if (switch_strlen_zero(cmd) || (argc = switch_separate_string(data, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) { if (switch_strlen_zero(cmd) || (argc = switch_separate_string(data, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 1 || !argv[0]) {
stream->write_function(stream, "%s\n", FIFO_API_SYNTAX); stream->write_function(stream, "%s\n", FIFO_API_SYNTAX);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -510,7 +510,7 @@ SWITCH_STANDARD_API(fifo_api_function)
if (!strcasecmp(argv[0], "list") || verbose) { if (!strcasecmp(argv[0], "list") || verbose) {
char *xml_text = NULL; char *xml_text = NULL;
switch_xml_t x_report = switch_xml_new("fifo_report"); switch_xml_t x_report = switch_xml_new("fifo_report");
assert(x_report); switch_assert(x_report);
if (argc < 2) { if (argc < 2) {
for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) {
@ -528,7 +528,7 @@ SWITCH_STANDARD_API(fifo_api_function)
} }
} }
xml_text = switch_xml_toxml(x_report, SWITCH_FALSE); xml_text = switch_xml_toxml(x_report, SWITCH_FALSE);
assert(xml_text); switch_assert(xml_text);
stream->write_function(stream, "%s\n", xml_text); stream->write_function(stream, "%s\n", xml_text);
switch_xml_free(x_report); switch_xml_free(x_report);
switch_safe_free(xml_text); switch_safe_free(xml_text);

8
src/mod/applications/mod_limit/mod_limit.c
View File

@ -345,7 +345,7 @@ SWITCH_STANDARD_API(db_api_function)
argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0]))); argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0])));
} }
if (argc < 1) { if (argc < 1 || !argv[0]) {
goto error; goto error;
} }
@ -419,7 +419,7 @@ SWITCH_STANDARD_APP(db_function)
argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0]))); argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0])));
} }
if (argc < 4) { if (argc < 4 || !argv[0]) {
goto error; goto error;
} }
@ -460,7 +460,7 @@ SWITCH_STANDARD_API(group_api_function)
argc = switch_separate_string(mydata, ':', argv, (sizeof(argv) / sizeof(argv[0]))); argc = switch_separate_string(mydata, ':', argv, (sizeof(argv) / sizeof(argv[0])));
} }
if (argc < 2) { if (argc < 2 || !argv[0]) {
goto error; goto error;
} }
@ -544,7 +544,7 @@ SWITCH_STANDARD_APP(group_function)
argc = switch_separate_string(mydata, ':', argv, (sizeof(argv) / sizeof(argv[0]))); argc = switch_separate_string(mydata, ':', argv, (sizeof(argv) / sizeof(argv[0])));
} }
if (argc < 3) { if (argc < 3 || !argv[0]) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: group %s\n", DB_USAGE); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: group %s\n", DB_USAGE);
return; return;
} }