kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

revert patch, breaks fs_cli

This commit is contained in:
Anthony Minessale 2010-07-27 10:46:04 -05:00
parent c8f9fb565c
commit 21d20ac3f8
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/switch_loadable_module.c
View File

@ -1627,8 +1627,7 @@ SWITCH_DECLARE(switch_status_t) switch_api_execute(const char *cmd, const char *
{ {
switch_api_interface_t *api; switch_api_interface_t *api;
switch_status_t status; switch_status_t status;
char *myarg = NULL, *argp = NULL;
switch_assert(stream != NULL); switch_assert(stream != NULL);
switch_assert(stream->data != NULL); switch_assert(stream->data != NULL);
switch_assert(stream->write_function != NULL); switch_assert(stream->write_function != NULL);
@ -1637,25 +1636,18 @@ SWITCH_DECLARE(switch_status_t) switch_api_execute(const char *cmd, const char *
switch_event_create(&stream->param_event, SWITCH_EVENT_API); switch_event_create(&stream->param_event, SWITCH_EVENT_API);
} }
if (arg) {
myarg = strdup(arg);
argp = myarg;
while(*argp == ' ') argp++;
while(end_of(argp) == ' ') end_of(argp) = '\0';
}
if (stream->param_event) { if (stream->param_event) {
if (cmd) { if (cmd) {
switch_event_add_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Command", cmd); switch_event_add_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Command", cmd);
} }
if (argp) { if (arg) {
switch_event_add_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Command-Argument", argp); switch_event_add_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Command-Argument", arg);
} }
} }
if (cmd && (api = switch_loadable_module_get_api_interface(cmd)) != 0) { if (cmd && (api = switch_loadable_module_get_api_interface(cmd)) != 0) {
if ((status = api->function(argp, session, stream)) != SWITCH_STATUS_SUCCESS) { if ((status = api->function(arg, session, stream)) != SWITCH_STATUS_SUCCESS) {
stream->write_function(stream, "COMMAND RETURNED ERROR!\n"); stream->write_function(stream, "COMMAND RETURNED ERROR!\n");
} }
UNPROTECT_INTERFACE(api); UNPROTECT_INTERFACE(api);
@ -1668,8 +1660,7 @@ SWITCH_DECLARE(switch_status_t) switch_api_execute(const char *cmd, const char *
switch_event_fire(&stream->param_event); switch_event_fire(&stream->param_event);
} }
switch_safe_free(myarg);
return status; return status;
} }