simplify a conditional expression using S_OR

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77630 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d28dfcd0f6dc0ea2b2e59fc7a7ae35079d7e24b0..528cc83fa13f49ee964ccf0948959c593b2a489b 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -17455,10 +17455,7 @@ static int reload_config(enum channelreloadreason reason)
        global_allowsubscribe = FALSE;
        snprintf(global_useragent, sizeof(global_useragent), "%s %s", DEFAULT_USERAGENT, ASTERISK_VERSION);
        ast_copy_string(default_notifymime, DEFAULT_NOTIFYMIME, sizeof(default_notifymime));
-       if (ast_strlen_zero(ast_config_AST_SYSTEM_NAME))
-               ast_copy_string(global_realm, DEFAULT_REALM, sizeof(global_realm));
-       else
-               ast_copy_string(global_realm, ast_config_AST_SYSTEM_NAME, sizeof(global_realm));
+       ast_copy_string(global_realm, S_OR(ast_config_AST_SYSTEM_NAME, DEFAULT_REALM), sizeof(global_realm));
        ast_copy_string(default_callerid, DEFAULT_CALLERID, sizeof(default_callerid));
        compactheaders = DEFAULT_COMPACTHEADERS;
        global_reg_timeout = DEFAULT_REGISTRATION_TIMEOUT;