Archived
14
0
Fork 0

simplify a conditional expression using S_OR

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77630 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rizzo 2007-07-28 09:29:22 +00:00
parent 81bccfe9d9
commit f9b96fa2fb

View file

@ -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;