aboutsummaryrefslogtreecommitdiffstats
path: root/main/manager.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/manager.c')
-rw-r--r--main/manager.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/main/manager.c b/main/manager.c
index 5b3da31..9478241 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -41,6 +41,10 @@
/*! @{
Doxygen group */
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -5136,7 +5140,7 @@ int ast_manager_unregister(char *action)
return 0;
}
-static int manager_state_cb(char *context, char *exten, int state, void *data)
+static int manager_state_cb(const char *context, const char *exten, enum ast_extension_states state, void *data)
{
/* Notify managers of change */
char hint[512];
@@ -5621,7 +5625,7 @@ static void xml_translate(struct ast_str **out, char *in, struct ast_variable *g
}
}
-static void process_output(struct mansession *s, struct ast_str *out, struct ast_variable *params, enum output_format format)
+static void process_output(struct mansession *s, struct ast_str **out, struct ast_variable *params, enum output_format format)
{
char *buf;
size_t l;
@@ -5638,14 +5642,14 @@ static void process_output(struct mansession *s, struct ast_str *out, struct ast
ast_log(LOG_WARNING, "mmap failed. Manager output was not processed\n");
} else {
if (format == FORMAT_XML || format == FORMAT_HTML) {
- xml_translate(&out, buf, params, format);
+ xml_translate(out, buf, params, format);
} else {
- ast_str_append(&out, 0, "%s", buf);
+ ast_str_append(out, 0, "%s", buf);
}
munmap(buf, l);
}
} else if (format == FORMAT_XML || format == FORMAT_HTML) {
- xml_translate(&out, "", params, format);
+ xml_translate(out, "", params, format);
}
fclose(s->f);
@@ -5803,7 +5807,7 @@ static int generic_http_callback(struct ast_tcptls_session_instance *ser,
ast_str_append(&out, 0, ROW_FMT, TEST_STRING);
}
- process_output(&s, out, params, format);
+ process_output(&s, &out, params, format);
if (format == FORMAT_XML) {
ast_str_append(&out, 0, "</ajax-response>\n");
@@ -6115,7 +6119,7 @@ static int auth_http_callback(struct ast_tcptls_session_instance *ser,
"<input type=\"submit\" value=\"Send request\" /></th></tr>\r\n");
}
- process_output(&s, out, params, format);
+ process_output(&s, &out, params, format);
if (format == FORMAT_XML) {
ast_str_append(&out, 0, "</ajax-response>\n");