diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-30 21:37:11 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-30 21:37:11 +0000 |
commit | 79c7f47ef48159bf5edf96eaee838fa304b6494d (patch) | |
tree | fa6f5aeb0036f9fe70a457a0509c4bffe2453d94 /asterisk.c | |
parent | 543e29ac150b65e2561c2e3058a694bc092a0f03 (diff) |
move processing of 'languageprefix' option to proper section of config file
document that option :-)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@30934 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'asterisk.c')
-rw-r--r-- | asterisk.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/asterisk.c b/asterisk.c index aa235c7d0..ad92a5c0f 100644 --- a/asterisk.c +++ b/asterisk.c @@ -2190,8 +2190,8 @@ static void ast_readconfig(void) if (!cfg) { return; } - v = ast_variable_browse(cfg, "files"); - while (v) { + + for (v = ast_variable_browse(cfg, "files"); v; v = v->next) { if (!strcasecmp(v->name, "astctlpermissions")) { ast_copy_string(ast_config_AST_CTL_PERMISSIONS, v->value, sizeof(ast_config_AST_CTL_PERMISSIONS)); } else if (!strcasecmp(v->name, "astctlowner")) { @@ -2201,10 +2201,9 @@ static void ast_readconfig(void) } else if (!strcasecmp(v->name, "astctl")) { ast_copy_string(ast_config_AST_CTL, v->value, sizeof(ast_config_AST_CTL)); } - v = v->next; } - v = ast_variable_browse(cfg, "directories"); - while(v) { + + for (v = ast_variable_browse(cfg, "directories"); v; v = v->next) { if (!strcasecmp(v->name, "astetcdir")) { ast_copy_string(ast_config_AST_CONFIG_DIR, v->value, sizeof(ast_config_AST_CONFIG_DIR)); } else if (!strcasecmp(v->name, "astspooldir")) { @@ -2226,13 +2225,10 @@ static void ast_readconfig(void) ast_copy_string(ast_config_AST_RUN_DIR, v->value, sizeof(ast_config_AST_RUN_DIR)); } else if (!strcasecmp(v->name, "astmoddir")) { ast_copy_string(ast_config_AST_MODULE_DIR, v->value, sizeof(ast_config_AST_MODULE_DIR)); - } else if (!strcasecmp(v->name, "languageprefix")) { - ast_language_is_prefix = ast_true(v->value); } - v = v->next; } - v = ast_variable_browse(cfg, "options"); - while(v) { + + for (v = ast_variable_browse(cfg, "options"); v; v = v->next) { /* verbose level (-v at startup) */ if (!strcasecmp(v->name, "verbose")) { option_verbose = atoi(v->value); @@ -2311,8 +2307,9 @@ static void ast_readconfig(void) ast_copy_string(ast_config_AST_RUN_GROUP, v->value, sizeof(ast_config_AST_RUN_GROUP)); } else if (!strcasecmp(v->name, "systemname")) { ast_copy_string(ast_config_AST_SYSTEM_NAME, v->value, sizeof(ast_config_AST_SYSTEM_NAME)); + } else if (!strcasecmp(v->name, "languageprefix")) { + ast_language_is_prefix = ast_true(v->value); } - v = v->next; } ast_config_destroy(cfg); } |