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

diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 36ce888307a26498a9a1013c2d47bdbc1227ee84..95e31af13118c2888bb43b1e224b761d05f815b2 100644 (file)
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -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)
 {

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 9bd58bb845c3dc51b85b4e804f15b43d33289c96..055010a1adce272c578277ad44ca64bc8a5e5335 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -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);
 }