From 21d20ac3f8774bca63ea7959f6683c854ddb4f26 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 27 Jul 2010 10:46:04 -0500 Subject: [PATCH] revert patch, breaks fs_cli --- src/switch_loadable_module.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c index 811383817c..97cb5e8d70 100644 --- a/src/switch_loadable_module.c +++ b/src/switch_loadable_module.c @@ -1627,8 +1627,7 @@ SWITCH_DECLARE(switch_status_t) switch_api_execute(const char *cmd, const char * { switch_api_interface_t *api; switch_status_t status; - char *myarg = NULL, *argp = NULL; - + switch_assert(stream != NULL); switch_assert(stream->data != 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); } - if (arg) { - myarg = strdup(arg); - argp = myarg; - while(*argp == ' ') argp++; - while(end_of(argp) == ' ') end_of(argp) = '\0'; - } - if (stream->param_event) { if (cmd) { switch_event_add_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Command", cmd); } - if (argp) { - switch_event_add_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Command-Argument", argp); + if (arg) { + 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 ((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"); } 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_safe_free(myarg); - + return status; }