FS-11601: Fix some core function prototype

diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index 298639d6ab32e49623653d78418fd646e135ebfd..526fe2632351aa7304bc93b77ae3b0f1eee6752e 100644 (file)
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -1992,7 +1992,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_open(_In_ switch_speech_handl
   \param flags flags in/out for fine tuning
   \return SWITCH_STATUS_SUCCESS with len adjusted to the bytes written if successful
 */
-SWITCH_DECLARE(switch_status_t) switch_core_speech_feed_tts(switch_speech_handle_t *sh, char *text, switch_speech_flag_t *flags);
+SWITCH_DECLARE(switch_status_t) switch_core_speech_feed_tts(switch_speech_handle_t *sh, const char *text, switch_speech_flag_t *flags);
 
 /*!
   \brief Flush TTS audio on a given handle

diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h
index 3525ab28ff92267cbeff1691619ceee3daf1e037..5a444d552b23fb9d1ede061cee31f0da933b158f 100644 (file)
--- a/src/include/switch_ivr.h
+++ b/src/include/switch_ivr.h
@@ -292,7 +292,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech_start_input_timers(swit
   \param fh file handle to use (NULL for builtin one)
   \return SWITCH_STATUS_SUCCESS if all is well
 */
-SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t *session, char *file, uint32_t limit, switch_file_handle_t *fh);
+SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t *session, const char *file, uint32_t limit, switch_file_handle_t *fh);
 SWITCH_DECLARE(switch_status_t) switch_ivr_transfer_recordings(switch_core_session_t *orig_session, switch_core_session_t *new_session);
 
 
@@ -471,7 +471,7 @@ SWITCH_DECLARE(switch_status_t) switch_play_and_get_digits(switch_core_session_t
 
 SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session_t *session,
                                                                                                                         switch_speech_handle_t *sh,
-                                                                                                                        switch_codec_t *codec, switch_timer_t *timer, char *text, switch_input_args_t *args);
+                                                                                                                        switch_codec_t *codec, switch_timer_t *timer, const char *text, switch_input_args_t *args);
 SWITCH_DECLARE(void) switch_ivr_clear_speech_cache(switch_core_session_t *session);
 /*!
   \brief Speak given text with given tts engine
@@ -483,7 +483,7 @@ SWITCH_DECLARE(void) switch_ivr_clear_speech_cache(switch_core_session_t *sessio
   \return SWITCH_STATUS_SUCCESS if all is well
 */
 SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *session,
-                                                                                                         const char *tts_name, const char *voice_name, char *text, switch_input_args_t *args);
+                                                                                                         const char *tts_name, const char *voice_name, const char *text, switch_input_args_t *args);
 
 /*!
   \brief Make an outgoing call

diff --git a/src/include/switch_loadable_module.h b/src/include/switch_loadable_module.h
index 9299857f68c675dde860c8c427efcd51dc74b8b1..9cc99ee0be3c5de13a6cd904c18922240ea9fce2 100644 (file)
--- a/src/include/switch_loadable_module.h
+++ b/src/include/switch_loadable_module.h
@@ -302,7 +302,7 @@ SWITCH_DECLARE(switch_status_t) switch_json_api_execute(cJSON *json, switch_core
   \param err pointer to error message
   \return the status
 */
-SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, char *fname, switch_bool_t runtime, const char **err);
+SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(const char *dir, const char *fname, switch_bool_t runtime, const char **err);
 
 /*!
   \brief Check if a module is loaded

diff --git a/src/switch_core_speech.c b/src/switch_core_speech.c
index 91d7fa9f78435f0e85e7e8312644ec20a5c2193d..956b4ce37b98c3bb2eef450b13ab9c899a5ca10f 100644 (file)
--- a/src/switch_core_speech.c
+++ b/src/switch_core_speech.c
@@ -96,7 +96,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_open(switch_speech_handle_t *
        return status;
 }
 
-SWITCH_DECLARE(switch_status_t) switch_core_speech_feed_tts(switch_speech_handle_t *sh, char *text, switch_speech_flag_t *flags)
+SWITCH_DECLARE(switch_status_t) switch_core_speech_feed_tts(switch_speech_handle_t *sh, const char *text, switch_speech_flag_t *flags)
 {
        switch_status_t status = SWITCH_STATUS_SUCCESS;
        char *param_string = NULL;

diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c
index f318fd987495b17f24f16cfdfcdf93ccf119553c..db4ceac9ccef131b0636ee1670069647ea6fc169 100644 (file)
--- a/src/switch_ivr_async.c
+++ b/src/switch_ivr_async.c
@@ -2538,7 +2538,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
        return status;
 }
 
-SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t *session, char *file, uint32_t limit, switch_file_handle_t *fh)
+SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t *session, const char *file, uint32_t limit, switch_file_handle_t *fh)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
        const char *p;

diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index abc028852d9f63f474552aab2e63595f77cbe32f..dd923be81aaa3afd3193cf631df5a426ce3a40bb 100644 (file)
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -2644,7 +2644,7 @@ SWITCH_DECLARE(switch_status_t) switch_play_and_get_digits(switch_core_session_t
 
 SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session_t *session,
                                                                                                                         switch_speech_handle_t *sh,
-                                                                                                                        switch_codec_t *codec, switch_timer_t *timer, char *text, switch_input_args_t *args)
+                                                                                                                        switch_codec_t *codec, switch_timer_t *timer, const char *text, switch_input_args_t *args)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
        short abuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
@@ -2656,8 +2656,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session
        switch_status_t status = SWITCH_STATUS_SUCCESS;
        switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
        switch_size_t extra = 0;
-       char *p, *tmp = NULL;
-       const char *star, *pound;
+       char *tmp = NULL;
+       const char *star, *pound, *p;
        switch_size_t starlen, poundlen;
 
        if (!sh) {
@@ -2940,7 +2940,7 @@ SWITCH_DECLARE(void) switch_ivr_clear_speech_cache(switch_core_session_t *sessio
 }
 
 SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *session,
-                                                                                                         const char *tts_name, const char *voice_name, char *text, switch_input_args_t *args)
+                                                                                                         const char *tts_name, const char *voice_name, const char *text, switch_input_args_t *args)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
        uint32_t rate = 0;

diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index 8a1d65379b00ef2e246ae4adb13416f5f9dde772..b3ec9d4ebb430b8372490230933c2928c389a09a 100644 (file)
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -95,7 +95,7 @@ struct switch_loadable_module_container {
 static struct switch_loadable_module_container loadable_modules;
 static switch_status_t do_shutdown(switch_loadable_module_t *module, switch_bool_t shutdown, switch_bool_t unload, switch_bool_t fail_if_busy,
                                                                   const char **err);
-static switch_status_t switch_loadable_module_load_module_ex(char *dir, char *fname, switch_bool_t runtime, switch_bool_t global, const char **err);
+static switch_status_t switch_loadable_module_load_module_ex(const char *dir, const char *fname, switch_bool_t runtime, switch_bool_t global, const char **err);
 
 static void *SWITCH_THREAD_FUNC switch_loadable_module_exec(switch_thread_t *thread, void *obj)
 {
@@ -1544,12 +1544,12 @@ static switch_status_t switch_loadable_module_load_file(char *path, char *filena
        return SWITCH_STATUS_SUCCESS;
 
 }
-SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, char *fname, switch_bool_t runtime, const char **err)
+SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(const char *dir, const char *fname, switch_bool_t runtime, const char **err)
 {
        return switch_loadable_module_load_module_ex(dir, fname, runtime, SWITCH_FALSE, err);
 }
 
-static switch_status_t switch_loadable_module_load_module_ex(char *dir, char *fname, switch_bool_t runtime, switch_bool_t global, const char **err)
+static switch_status_t switch_loadable_module_load_module_ex(const char *dir, const char *fname, switch_bool_t runtime, switch_bool_t global, const char **err)
 {
        switch_size_t len = 0;
        char *path;
@@ -1902,7 +1902,7 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo
                                if (path && zstr(path)) {
                                        path = SWITCH_GLOBAL_dirs.mod_dir;
                                }
-                               if (switch_loadable_module_load_module_ex((char *) path, (char *) val, SWITCH_FALSE, global, &err) == SWITCH_STATUS_GENERR) {
+                               if (switch_loadable_module_load_module_ex(path, val, SWITCH_FALSE, global, &err) == SWITCH_STATUS_GENERR) {
                                        if (critical && switch_true(critical)) {
                                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to load critical module '%s', abort()\n", val);
                                                abort();
@@ -1935,7 +1935,7 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo
                                if (path && zstr(path)) {
                                        path = SWITCH_GLOBAL_dirs.mod_dir;
                                }
-                               switch_loadable_module_load_module_ex((char *) path, (char *) val, SWITCH_FALSE, global, &err);
+                               switch_loadable_module_load_module_ex(path, val, SWITCH_FALSE, global, &err);
                                count++;
                        }
                }
@@ -1975,7 +1975,7 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo
                                continue;
                        }
 
-                       switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) fname, SWITCH_FALSE, &err);
+                       switch_loadable_module_load_module(SWITCH_GLOBAL_dirs.mod_dir, fname, SWITCH_FALSE, &err);
                }
                apr_dir_close(module_dir_handle);
        }