提交 7c0b7487 authored 作者: Michael Jerris's avatar Michael Jerris

cleanup whitespace in commands

上级 4da5c5cf
...@@ -1714,18 +1714,23 @@ SWITCH_STANDARD_API(ctl_function) ...@@ -1714,18 +1714,23 @@ SWITCH_STANDARD_API(ctl_function)
SWITCH_STANDARD_API(load_function) SWITCH_STANDARD_API(load_function)
{ {
const char *err; const char *err;
char *mod;
if (zstr(cmd)) { if (zstr(cmd)) {
stream->write_function(stream, "-USAGE: %s\n", LOAD_SYNTAX); stream->write_function(stream, "-USAGE: %s\n", LOAD_SYNTAX);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) cmd, SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS) { mod = switch_strip_whitespace(cmd);
if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, mod, SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS) {
stream->write_function(stream, "+OK\n"); stream->write_function(stream, "+OK\n");
} else { } else {
stream->write_function(stream, "-ERR [%s]\n", err); stream->write_function(stream, "-ERR [%s]\n", err);
} }
switch_safe_free(mod);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
...@@ -1735,6 +1740,7 @@ SWITCH_STANDARD_API(unload_function) ...@@ -1735,6 +1740,7 @@ SWITCH_STANDARD_API(unload_function)
const char *err; const char *err;
switch_bool_t force = SWITCH_FALSE; switch_bool_t force = SWITCH_FALSE;
const char *p = cmd; const char *p = cmd;
char *mod;
if (zstr(cmd)) { if (zstr(cmd)) {
stream->write_function(stream, "-USAGE: %s\n", UNLOAD_SYNTAX); stream->write_function(stream, "-USAGE: %s\n", UNLOAD_SYNTAX);
...@@ -1765,12 +1771,16 @@ SWITCH_STANDARD_API(unload_function) ...@@ -1765,12 +1771,16 @@ SWITCH_STANDARD_API(unload_function)
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
if (switch_loadable_module_unload_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) cmd, force, &err) == SWITCH_STATUS_SUCCESS) { mod = switch_strip_whitespace(cmd);
if (switch_loadable_module_unload_module((char *) SWITCH_GLOBAL_dirs.mod_dir, mod, force, &err) == SWITCH_STATUS_SUCCESS) {
stream->write_function(stream, "+OK\n"); stream->write_function(stream, "+OK\n");
} else { } else {
stream->write_function(stream, "-ERR [%s]\n", err); stream->write_function(stream, "-ERR [%s]\n", err);
} }
switch_safe_free(mod);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
...@@ -1779,6 +1789,7 @@ SWITCH_STANDARD_API(reload_function) ...@@ -1779,6 +1789,7 @@ SWITCH_STANDARD_API(reload_function)
const char *err; const char *err;
switch_bool_t force = SWITCH_FALSE; switch_bool_t force = SWITCH_FALSE;
const char *p = cmd; const char *p = cmd;
char *mod;
if (zstr(cmd)) { if (zstr(cmd)) {
stream->write_function(stream, "-USAGE: %s\n", UNLOAD_SYNTAX); stream->write_function(stream, "-USAGE: %s\n", UNLOAD_SYNTAX);
...@@ -1808,18 +1819,24 @@ SWITCH_STANDARD_API(reload_function) ...@@ -1808,18 +1819,24 @@ SWITCH_STANDARD_API(reload_function)
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
if (switch_loadable_module_unload_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) cmd, force, &err) == SWITCH_STATUS_SUCCESS) { mod = switch_strip_whitespace(cmd);
printf("WTF XXX [%s] [%s] \n", cmd, mod);
if (switch_loadable_module_unload_module((char *) SWITCH_GLOBAL_dirs.mod_dir, mod, force, &err) == SWITCH_STATUS_SUCCESS) {
stream->write_function(stream, "+OK module unloaded\n"); stream->write_function(stream, "+OK module unloaded\n");
} else { } else {
stream->write_function(stream, "-ERR unloading module [%s]\n", err); stream->write_function(stream, "-ERR unloading module [%s]\n", err);
} }
if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) cmd, SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS) { if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, mod, SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS) {
stream->write_function(stream, "+OK module loaded\n"); stream->write_function(stream, "+OK module loaded\n");
} else { } else {
stream->write_function(stream, "-ERR loading module [%s]\n", err); stream->write_function(stream, "-ERR loading module [%s]\n", err);
} }
switch_safe_free(mod);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论