Author: mikej Date: Fri Aug 22 13:14:19 2008 New Revision: 9349 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: new macro Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Aug 22 13:14:19 2008 @@ -59,7 +59,8 @@ \param s the string to test \return true value if the string is NULL or zero length */ -#define switch_strlen_zero(s) (!s || *s == '\0') +#define switch_strlen_zero(s) (!s || *(s) == '\0') +#define switch_strlen_zero_buf(s) (*(s) == '\0') static inline switch_bool_t switch_is_moh(const char *s) { if (switch_strlen_zero(s) || !strcasecmp(s, "silence") || !strcasecmp(s, "indicate_hold")) { Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Aug 22 13:14:19 2008 @@ -1403,7 +1403,7 @@ switch_snprintf(msg_count, sizeof(msg_count), "%d:urgent-new", total_new_urgent_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &args)); informed++; - if ((*global_buf =! '\0')) { + if (!switch_strlen_zero_buf(global_buf) { vm_check_state = VM_CHECK_MENU; continue; } @@ -1412,7 +1412,7 @@ switch_snprintf(msg_count, sizeof(msg_count), "%d:new", total_new_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &args)); informed++; - if ((*global_buf =! '\0')) { + if (!switch_strlen_zero_buf(global_buf) { vm_check_state = VM_CHECK_MENU; continue; } @@ -1621,7 +1621,7 @@ char input[10] = ""; char key_buf[80] = ""; play_msg_type = MSG_NONE; - if (!switch_strlen_zero(global_buf)) { + if (!switch_strlen_zero_buf(global_buf)) { switch_set_string(input, global_buf); *global_buf = '\0'; status = SWITCH_STATUS_SUCCESS;