mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-27 13:44:16 +00:00
part 3 of 3 standardizing typedefed types to end in _t.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1300 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
76f4a10a18
commit
14fee78470
60 files changed
+957
-957
No files matched your search
@@ -80,12 +80,12 @@ static void perl_function(switch_core_session_t *session, char *data)
|
||||
destroy_perl(&my_perl);
|
||||
}
|
||||
|
||||
static const switch_application_interface perl_application_interface = {
|
||||
static const switch_application_interface_t perl_application_interface = {
|
||||
/*.interface_name */ "perl",
|
||||
/*.application_function */ perl_function
|
||||
};
|
||||
|
||||
static switch_loadable_module_interface perl_module_interface = {
|
||||
static switch_loadable_module_interface_t perl_module_interface = {
|
||||
/*.module_name */ modname,
|
||||
/*.endpoint_interface */ NULL,
|
||||
/*.timer_interface */ NULL,
|
||||
@@ -99,7 +99,7 @@ static switch_loadable_module_interface perl_module_interface = {
|
||||
};
|
||||
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void)
|
||||
{
|
||||
if (globals.my_perl) {
|
||||
perl_destruct(globals.my_perl);
|
||||
@@ -110,7 +110,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename)
|
||||
{
|
||||
|
||||
PerlInterpreter *my_perl;
|
||||
|
||||
@@ -17,7 +17,7 @@ void fs_core_set_globals(void)
|
||||
|
||||
int fs_core_init(char *path)
|
||||
{
|
||||
switch_status status;
|
||||
switch_status_t status;
|
||||
|
||||
if (switch_strlen_zero(path)) {
|
||||
path = NULL;
|
||||
@@ -30,7 +30,7 @@ int fs_core_init(char *path)
|
||||
|
||||
int fs_core_destroy(void)
|
||||
{
|
||||
switch_status status;
|
||||
switch_status_t status;
|
||||
|
||||
status = switch_core_destroy();
|
||||
|
||||
@@ -102,7 +102,7 @@ void fs_channel_get_variable(switch_core_session_t *session, char *var)
|
||||
void fs_channel_set_state(switch_core_session_t *session, char *state)
|
||||
{
|
||||
switch_channel_t *channel = switch_core_session_get_channel(session);
|
||||
switch_channel_state fs_state = switch_channel_get_state(channel);
|
||||
switch_channel_state_t fs_state = switch_channel_get_state(channel);
|
||||
|
||||
if (!strcmp(state, "EXECUTE")) {
|
||||
fs_state = CS_EXECUTE;
|
||||
@@ -115,7 +115,7 @@ void fs_channel_set_state(switch_core_session_t *session, char *state)
|
||||
|
||||
int fs_ivr_play_file(switch_core_session_t *session, char *file, char *timer_name)
|
||||
{
|
||||
switch_status status;
|
||||
switch_status_t status;
|
||||
if (switch_strlen_zero(timer_name)) {
|
||||
timer_name = NULL;
|
||||
}
|
||||
|
||||
@@ -157,7 +157,7 @@ static void js_error(JSContext *cx, const char *message, JSErrorReport *report)
|
||||
|
||||
}
|
||||
|
||||
static switch_status init_js(void)
|
||||
static switch_status_t init_js(void)
|
||||
{
|
||||
memset(&globals, 0, sizeof(globals));
|
||||
globals.gQuitting = JS_FALSE;
|
||||
@@ -175,7 +175,7 @@ static switch_status init_js(void)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status js_stream_dtmf_callback(switch_core_session_t *session, char *dtmf, void *buf, unsigned int buflen)
|
||||
static switch_status_t js_stream_dtmf_callback(switch_core_session_t *session, char *dtmf, void *buf, unsigned int buflen)
|
||||
{
|
||||
char code[2048];
|
||||
struct dtmf_callback_state *cb_state = buf;
|
||||
@@ -283,7 +283,7 @@ static switch_status js_stream_dtmf_callback(switch_core_session_t *session, cha
|
||||
}
|
||||
|
||||
|
||||
static switch_status js_record_dtmf_callback(switch_core_session_t *session, char *dtmf, void *buf, unsigned int buflen)
|
||||
static switch_status_t js_record_dtmf_callback(switch_core_session_t *session, char *dtmf, void *buf, unsigned int buflen)
|
||||
{
|
||||
char code[2048];
|
||||
struct dtmf_callback_state *cb_state = buf;
|
||||
@@ -344,7 +344,7 @@ static switch_status js_record_dtmf_callback(switch_core_session_t *session, cha
|
||||
}
|
||||
|
||||
|
||||
static switch_status js_speak_dtmf_callback(switch_core_session_t *session, char *dtmf, void *buf, unsigned int buflen)
|
||||
static switch_status_t js_speak_dtmf_callback(switch_core_session_t *session, char *dtmf, void *buf, unsigned int buflen)
|
||||
{
|
||||
char code[2048];
|
||||
struct dtmf_callback_state *cb_state = buf;
|
||||
@@ -397,7 +397,7 @@ static JSBool session_recordfile(JSContext *cx, JSObject *obj, uintN argc, jsval
|
||||
char *dtmf_callback = NULL;
|
||||
void *bp = NULL;
|
||||
int len = 0;
|
||||
switch_dtmf_callback_function dtmf_func = NULL;
|
||||
switch_dtmf_callback_function_t dtmf_func = NULL;
|
||||
struct dtmf_callback_state cb_state = {0};
|
||||
switch_file_handle_t fh;
|
||||
|
||||
@@ -443,7 +443,7 @@ static JSBool session_streamfile(JSContext *cx, JSObject *obj, uintN argc, jsval
|
||||
char *dtmf_callback = NULL;
|
||||
void *bp = NULL;
|
||||
int len = 0;
|
||||
switch_dtmf_callback_function dtmf_func = NULL;
|
||||
switch_dtmf_callback_function_t dtmf_func = NULL;
|
||||
struct dtmf_callback_state cb_state = {0};
|
||||
switch_file_handle_t fh;
|
||||
|
||||
@@ -499,7 +499,7 @@ static JSBool session_speak(JSContext *cx, JSObject *obj, uintN argc, jsval *arg
|
||||
void *bp = NULL;
|
||||
int len = 0;
|
||||
struct dtmf_callback_state cb_state = {0};
|
||||
switch_dtmf_callback_function dtmf_func = NULL;
|
||||
switch_dtmf_callback_function_t dtmf_func = NULL;
|
||||
|
||||
channel = switch_core_session_get_channel(jss->session);
|
||||
assert(channel != NULL);
|
||||
@@ -639,7 +639,7 @@ static JSBool session_execute(JSContext *cx, JSObject *obj, uintN argc, jsval *a
|
||||
{
|
||||
JSBool retval = JS_FALSE;
|
||||
if (argc > 1) {
|
||||
const switch_application_interface *application_interface;
|
||||
const switch_application_interface_t *application_interface;
|
||||
char *app_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
|
||||
char *app_arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
|
||||
struct js_session *jss = JS_GetPrivate(cx, obj);
|
||||
@@ -1315,7 +1315,7 @@ static JSBool db_exec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv
|
||||
char *sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
|
||||
char *err = NULL;
|
||||
void *arg = NULL;
|
||||
switch_core_db_callback_func cb_func = NULL;
|
||||
switch_core_db_callback_func_t cb_func = NULL;
|
||||
|
||||
|
||||
if (argc > 1) {
|
||||
@@ -2149,7 +2149,7 @@ static void js_thread_launch(char *text)
|
||||
}
|
||||
|
||||
|
||||
static switch_status launch_async(char *text, char *out, size_t outlen)
|
||||
static switch_status_t launch_async(char *text, char *out, size_t outlen)
|
||||
{
|
||||
|
||||
if (switch_strlen_zero(text)) {
|
||||
@@ -2163,21 +2163,21 @@ static switch_status launch_async(char *text, char *out, size_t outlen)
|
||||
}
|
||||
|
||||
|
||||
static const switch_application_interface ivrtest_application_interface = {
|
||||
static const switch_application_interface_t ivrtest_application_interface = {
|
||||
/*.interface_name */ "javascript",
|
||||
/*.application_function */ js_parse_and_execute,
|
||||
NULL, NULL, NULL,
|
||||
/*.next*/ NULL
|
||||
};
|
||||
|
||||
static struct switch_api_interface js_run_interface = {
|
||||
static switch_api_interface_t js_run_interface = {
|
||||
/*.interface_name */ "jsrun",
|
||||
/*.desc */ "run a script",
|
||||
/*.function */ launch_async,
|
||||
/*.next */ NULL
|
||||
};
|
||||
|
||||
static switch_loadable_module_interface spidermonkey_module_interface = {
|
||||
static switch_loadable_module_interface_t spidermonkey_module_interface = {
|
||||
/*.module_name */ modname,
|
||||
/*.endpoint_interface */ NULL,
|
||||
/*.timer_interface */ NULL,
|
||||
@@ -2190,9 +2190,9 @@ static switch_loadable_module_interface spidermonkey_module_interface = {
|
||||
/*.directory_interface */ NULL
|
||||
};
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename)
|
||||
{
|
||||
switch_status status;
|
||||
switch_status_t status;
|
||||
|
||||
if ((status = init_js()) != SWITCH_STATUS_SUCCESS) {
|
||||
return status;
|
||||
|
||||
Reference in new issue
Block a user