retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

change zstr to inline and fix small display update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15385 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-11-06 16:00:56 +00:00
parent b6b7dd26d8
commit e6e5f61069
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/switch_utils.h
View File

@ -74,7 +74,10 @@ SWITCH_DECLARE(int) switch_isxdigit(int c);
\param s the string to test
\return true value if the string is NULL or zero length
*/
#define zstr(s) (!s || *(s) == '\0')
static inline int zstr(const char *s) {
return (!s || *(s) == '\0');
}
#define zstr_buf(s) (*(s) == '\0')
static inline switch_bool_t switch_is_moh(const char *s)
{

12
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -467,21 +467,21 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
}
}
if ((tmp = switch_channel_get_variable(channel, "effective_callee_id_name")) ||
if (((tmp = switch_channel_get_variable(channel, "effective_callee_id_name")) ||
(tmp = switch_channel_get_variable(channel, "sip_callee_id_name")) ||
(tmp = switch_channel_get_variable(channel, "callee_id_name"))) {
(tmp = switch_channel_get_variable(channel, "callee_id_name"))) && !zstr(tmp)) {
name = (char *)tmp;
}
if ((tmp = switch_channel_get_variable(channel, "effective_callee_id_number")) ||
if (((tmp = switch_channel_get_variable(channel, "effective_callee_id_number")) ||
(tmp = switch_channel_get_variable(channel, "sip_callee_id_number")) ||
(tmp = switch_channel_get_variable(channel, "callee_id_number"))) {
(tmp = switch_channel_get_variable(channel, "callee_id_number"))) && !zstr(tmp)) {
number = tmp;
}
if (zstr(name)) name = (char *) number;
if (zstr(name) || zstr(number)) {
if (zstr(name) && zstr(number)) {
goto end;
}
@ -507,7 +507,7 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
sofia_send_callee_id(session, NULL, NULL);
}
end:
end:
switch_safe_free(dup);
}