kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 00:41:41 +00:00
Code Issues Projects Releases Wiki Activity

fix nice fresh config bug

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@668 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-02-24 21:59:13 +00:00
parent 3d6ca65883
commit 5492b17e94
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/switch_config.c
View File

@ -137,7 +137,9 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
} }
cfg->catno = 0; cfg->catno = 0;
cfg->lineno = 0; cfg->lineno = 0;
*var = "";
*val = "";
return 1;
} else { } else {
switch_copy_string(cfg->category, *var, sizeof(cfg->category)); switch_copy_string(cfg->category, *var, sizeof(cfg->category));
cfg->catno++; cfg->catno++;
@ -145,6 +147,8 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
continue; continue;
} }
if (**var == '#' || **var == ';' || **var == '\n' || **var == '\r') { if (**var == '#' || **var == ';' || **var == '\n' || **var == '\r') {
continue; continue;
} }
@ -153,7 +157,8 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
break; break;
} }
if ((end = strchr(*var, '#')) != 0) {
if ((end = strchr(*var, '#')) != 0 || (end = strchr(*var, ';')) != 0) {
*end = '\0'; *end = '\0';
end--; end--;
} else if ((end = strchr(*var, '\n')) != 0) { } else if ((end = strchr(*var, '\n')) != 0) {
@ -170,6 +175,7 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
} }
*var = p; *var = p;
if ((*val = strchr(*var, '=')) == 0) { if ((*val = strchr(*var, '=')) == 0) {
ret = -1; ret = -1;
//log_printf(0, server.log, "Invalid syntax on %s: line %d\n", cfg->path, cfg->lineno); //log_printf(0, server.log, "Invalid syntax on %s: line %d\n", cfg->path, cfg->lineno);
@ -199,6 +205,7 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
} }
} }
return ret; return ret;
} }

1
src/switch_loadable_module.c
View File

@ -355,6 +355,7 @@ SWITCH_DECLARE(switch_status) switch_loadable_module_init()
if (switch_config_open_file(&cfg, cf)) { if (switch_config_open_file(&cfg, cf)) {
while (switch_config_next_pair(&cfg, &var, &val)) { while (switch_config_next_pair(&cfg, &var, &val)) {
count++; count++;
if (!strcasecmp(cfg.category, "modules")) { if (!strcasecmp(cfg.category, "modules")) {
if (!strcasecmp(var, "load")) { if (!strcasecmp(var, "load")) {
if (!strcasecmp(val, "all")) { if (!strcasecmp(val, "all")) {