diff --git a/src/include/switch_buffer.h b/src/include/switch_buffer.h index 702dc49ac2..033e3cb6db 100644 --- a/src/include/switch_buffer.h +++ b/src/include/switch_buffer.h @@ -117,7 +117,7 @@ SWITCH_DECLARE(void) switch_buffer_set_loops(switch_buffer_t *buffer, int32_t lo * \param datalen amount of data to be written * \return int amount of buffer used after the write, or 0 if no space available */ -SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, void *data, switch_size_t datalen); +SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, const void *data, switch_size_t datalen); /*! \brief Remove data from the buffer * \param buffer any buffer of type switch_buffer_t diff --git a/src/include/switch_caller.h b/src/include/switch_caller.h index 5401a15ce3..fe6d4c4274 100644 --- a/src/include/switch_caller.h +++ b/src/include/switch_caller.h @@ -128,7 +128,7 @@ struct switch_caller_extension { \param extension_number extension number \return a new extension object allocated from the session's memory pool */ -SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, char *extension_name, char *extension_number); +SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, const char *extension_name, const char *extension_number); /*! \brief Add an application (instruction) to the given extension @@ -138,7 +138,7 @@ SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_c \param extra_data optional argument to the application */ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session_t *session, - switch_caller_extension_t *caller_extension, char *application_name, char *extra_data); + switch_caller_extension_t *caller_extension, const char *application_name, const char *extra_data); /*! @@ -147,7 +147,7 @@ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session \param name the name \note this function is meant for situations where the name paramater is the contents of the variable */ -SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, char *name); +SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, const char *name); /*! \brief Create a new caller profile object @@ -191,7 +191,7 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_clone(switch_cor \param event the event to add the information to */ -SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, char *prefix, switch_event_t *event); +SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, const char *prefix, switch_event_t *event); SWITCH_END_EXTERN_C /** @} */ diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h index 7d553fc917..70acd812ec 100644 --- a/src/include/switch_channel.h +++ b/src/include/switch_channel.h @@ -89,7 +89,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_c \param str the string to check \return the code */ -SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(char *str); +SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(const char *str); /*! \brief return the cause code for a given channel @@ -103,7 +103,7 @@ SWITCH_DECLARE(switch_call_cause_t) switch_channel_get_cause(switch_channel_t *c \param cause the code to check \return the string */ -SWITCH_DECLARE(char *) switch_channel_cause2str(switch_call_cause_t cause); +SWITCH_DECLARE(const char *) switch_channel_cause2str(switch_call_cause_t cause); /*! \brief View the timetable of a channel @@ -136,7 +136,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_init(switch_channel_t *channel, s \param rpid the rpid if for the icon to use \param status the status message */ -SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, char *rpid, char *status); +SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, const char *rpid, const char *status); /*! \brief Uninitalize a channel @@ -218,7 +218,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_nodup(switch_channel \param varname the name of the variable \return the value of the requested variable */ -SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, char *varname); +SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, const char *varname); /*! * Start iterating over the entries in the channel variable list. @@ -373,7 +373,7 @@ SWITCH_DECLARE(const switch_state_handler_table_t *) switch_channel_get_state_ha \param private_info void pointer to private data \return SWITCH_STATUS_SUCCESS if data was set */ -SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, char *key, void *private_info); +SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, const char *key, const void *private_info); /*! \brief Retrieve private from a given channel @@ -381,7 +381,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *cha \param key unique keyname to retrieve your private data \return void pointer to channel's private data */ -SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, char *key); +SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key); /*! \brief Assign a name to a given channel @@ -389,7 +389,7 @@ SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, cha \param name name to assign \return SWITCH_STATUS_SUCCESS if name was assigned */ -SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, char *name); +SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, const char *name); /*! \brief Retrieve the name of a given channel @@ -423,7 +423,7 @@ SWITCH_DECLARE(switch_size_t) switch_channel_has_dtmf(switch_channel_t *channel) \param dtmf string of digits to queue \return SWITCH_STATUS_SUCCESS if successful */ -SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, char *dtmf); +SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, const char *dtmf); /*! \brief Retrieve DTMF digits from a given channel @@ -446,7 +446,7 @@ SWITCH_DECLARE(const char *) switch_channel_state_name(switch_channel_state_t st \param name the name of the state \return the enum value (numeric) */ -SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(char *name); +SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(const char *name); /*! \brief Add information about a given channel to an event object diff --git a/src/include/switch_core.h b/src/include/switch_core.h index 59c59bdc90..19d0d98496 100644 --- a/src/include/switch_core.h +++ b/src/include/switch_core.h @@ -220,7 +220,7 @@ SWITCH_DECLARE(void) switch_core_port_allocator_destroy(switch_core_port_allocat \param err a pointer to set any errors to \note to be called at application startup */ -SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err); +SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, const char **err); /*! \brief Initilize the core and load modules @@ -228,7 +228,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err \param err a pointer to set any errors to \note to be called at application startup instead of switch_core_init. Includes module loading. */ -SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, const char **err); +SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(const char *console, const char **err); /*! \brief Set/Get Session Limit @@ -503,7 +503,7 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(char #ifdef SWITCH_DEBUG_RWLOCKS #define switch_core_session_locate(uuid_str) switch_core_session_perform_locate(uuid_str, __FILE__, __SWITCH_FUNC__, __LINE__) #else -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(char *uuid_str); +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(const char *uuid_str); #endif /*! @@ -511,14 +511,14 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(char *uuid_st \param varname the name of the variable \return the value of the desired variable */ -SWITCH_DECLARE(char *) switch_core_get_variable(char *varname); +SWITCH_DECLARE(char *) switch_core_get_variable(const char *varname); /*! \brief Add a global variable to the core \param varname the name of the variable \param value the value of the variable */ -SWITCH_DECLARE(void) switch_core_set_variable(char *varname, char *value); +SWITCH_DECLARE(void) switch_core_set_variable(const char *varname, const char *value); /*! \brief Hangup All Sessions @@ -1395,7 +1395,7 @@ SWITCH_DECLARE(void) switch_core_runtime_loop(int bg); \brief Set the output console to the desired file \param console the file path */ -SWITCH_DECLARE(switch_status_t) switch_core_set_console(char *console); +SWITCH_DECLARE(switch_status_t) switch_core_set_console(const char *console); /*! \brief Breakdown a number of milliseconds into various time spec diff --git a/src/include/switch_loadable_module.h b/src/include/switch_loadable_module.h index 4b281abb65..86ea7d3f5f 100644 --- a/src/include/switch_loadable_module.h +++ b/src/include/switch_loadable_module.h @@ -97,21 +97,21 @@ SWITCH_DECLARE(void) switch_loadable_module_shutdown(void); \param name the name of the endpoint \return the desired endpoint interface */ -SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(char *name); +SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(const char *name); /*! \brief Retrieve the codec interface by it's registered name \param name the name of the codec \return the desired codec interface */ -SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(char *name); +SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(const char *name); /*! \brief Retrieve the dialplan interface by it's registered name \param name the name of the dialplan \return the desired dialplan interface */ -SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(char *name); +SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(const char *name); /*! \brief build a dynamic module object and register it (for use in double embeded modules) @@ -132,70 +132,70 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_build_dynamic(char *filen \param name the name of the timer \return the desired timer interface */ -SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(char *name); +SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(const char *name); /*! \brief Retrieve the application interface by it's registered name \param name the name of the application \return the desired application interface */ -SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(char *name); +SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(const char *name); /*! \brief Retrieve the API interface by it's registered name \param name the name of the API \return the desired API interface */ -SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(char *name); +SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(const char *name); /*! \brief Retrieve the file format interface by it's registered name \param name the name of the file format \return the desired file format interface */ -SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(char *name); +SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(const char *name); /*! \brief Retrieve the speech interface by it's registered name \param name the name of the speech interface \return the desired speech interface */ -SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(char *name); +SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(const char *name); /*! \brief Retrieve the asr interface by it's registered name \param name the name of the asr interface \return the desired asr interface */ -SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(char *name); +SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(const char *name); /*! \brief Retrieve the directory interface by it's registered name \param name the name of the directory interface \return the desired directory interface */ -SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(char *name); +SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(const char *name); /*! \brief Retrieve the chat interface by it's registered name \param name the name of the chat interface \return the desired chat interface */ -SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(char *name); +SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(const char *name); /*! \brief Retrieve the say interface by it's registered name \param name the name of the say interface \return the desired say interface */ -SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(char *name); +SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(const char *name); /*! \brief Retrieve the management interface by it's registered name \param relative_oid the relative oid of the management interface \return the desired management interface */ -SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(char *relative_oid); +SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(const char *relative_oid); /*! \brief Retrieve the list of loaded codecs into an array @@ -226,7 +226,7 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_ \param stream stream for output \return the status returned by the API call */ -SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); +SWITCH_DECLARE(switch_status_t) switch_api_execute(const char *cmd, const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); /*! \brief Load a module diff --git a/src/include/switch_regex.h b/src/include/switch_regex.h index f1ef020784..5b6b075a19 100644 --- a/src/include/switch_regex.h +++ b/src/include/switch_regex.h @@ -49,8 +49,8 @@ SWITCH_DECLARE(int) switch_regex_copy_substring(const char *subject, int *ovecto SWITCH_DECLARE(void) switch_regex_free(void *data); -SWITCH_DECLARE(int) switch_regex_perform(char *field, char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen); -SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, char *data, char *field_data, +SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen); +SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data, char *substituted, uint32_t len, int *ovector); /*! @@ -59,7 +59,7 @@ SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_c \param expression The regular expression to run against the string \return Boolean if a match was found or not */ -SWITCH_DECLARE(switch_status_t) switch_regex_match(char *target, char *expression); +SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const char *expression); #define switch_regex_safe_free(re) if (re) {\ switch_regex_free(re);\ diff --git a/src/include/switch_rtp.h b/src/include/switch_rtp.h index 224a932e9e..95614d6b2c 100644 --- a/src/include/switch_rtp.h +++ b/src/include/switch_rtp.h @@ -111,9 +111,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session \param pool a memory pool to use for the session \return the new RTP session or NULL on failure */ -SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(char *rx_host, +SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(const char *rx_host, switch_port_t rx_port, - char *tx_host, + const char *tx_host, switch_port_t tx_port, switch_payload_t payload, uint32_t samples_per_interval, @@ -128,7 +128,7 @@ SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(char *rx_host, \param port the remote port \param err pointer for error messages */ -SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err); +SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err); /*! \brief Assign a local address to the RTP session @@ -138,7 +138,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_ \param err pointer for error messages \note this call also binds the RTP session's socket to the new address */ -SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err); +SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err); /*! \brief Kill the socket on an existing RTP session diff --git a/src/include/switch_scheduler.h b/src/include/switch_scheduler.h index 2241247ea7..af731c9334 100644 --- a/src/include/switch_scheduler.h +++ b/src/include/switch_scheduler.h @@ -62,7 +62,7 @@ SWITCH_BEGIN_EXTERN_C */ SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime, switch_scheduler_func_t func, - char *desc, char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags); + const char *desc, const char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags); /*! \brief Delete a scheduled task @@ -76,7 +76,7 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_id(uint32_t task_id); \param group the group name \return the number of jobs deleted */ -SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(char *group); +SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(const char *group); /*! diff --git a/src/include/switch_types.h b/src/include/switch_types.h index 9485ca7543..b53756b2dd 100644 --- a/src/include/switch_types.h +++ b/src/include/switch_types.h @@ -1018,7 +1018,7 @@ typedef void (*switch_scheduler_func_t) (switch_scheduler_task_t *task); typedef switch_status_t (*switch_state_handler_t) (switch_core_session_t *); typedef struct switch_stream_handle switch_stream_handle_t; typedef switch_status_t (*switch_stream_handle_write_function_t) (switch_stream_handle_t *handle, const char *fmt, ...); -typedef switch_status_t (*switch_api_function_t) (char *in, switch_core_session_t *session, switch_stream_handle_t *stream); +typedef switch_status_t (*switch_api_function_t) (const char *in, switch_core_session_t *session, switch_stream_handle_t *stream); typedef switch_status_t (*switch_input_callback_function_t) (switch_core_session_t *session, void *input, switch_input_type_t input_type, void *buf, unsigned int buflen); typedef struct switch_say_interface switch_say_interface_t; diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h index 794df59dc2..f9ff741aeb 100644 --- a/src/include/switch_utils.h +++ b/src/include/switch_utils.h @@ -55,7 +55,7 @@ SWITCH_BEGIN_EXTERN_C #define switch_is_file_path(file) ((*file == '/') || strstr(file, SWITCH_URL_SEPARATOR)) #endif -static inline switch_bool_t switch_is_digit_string(char *s) { +static inline switch_bool_t switch_is_digit_string(const char *s) { while(s && *s) { if (*s < 48 || *s > 57) { @@ -104,7 +104,7 @@ SWITCH_DECLARE(char *) get_addr(char *buf, switch_size_t len, struct in_addr *in \param priority the priority to get the name of \return the printable form of the priority */ -SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority); +SWITCH_DECLARE(const char *) switch_priority_name(switch_priority_t priority); /*! \brief Return the RFC2833 character based on an event id @@ -260,7 +260,7 @@ static inline switch_bool_t switch_strstr(char *s, char *q) \param in the string \return the epoch time in usec */ -SWITCH_DECLARE(switch_time_t) switch_str_time(char *in); +SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in); /*! \brief Declares a function designed to set a dymaic global string @@ -288,7 +288,7 @@ SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char \param esc the escape character \return the escaped string */ -SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, char *delim, char esc); +SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, const char *delim, char esc); /*! \brief Wait for a socket diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c index 927cffb749..ac362ae9ba 100644 --- a/src/mod/applications/mod_commands/mod_commands.c +++ b/src/mod/applications/mod_commands/mod_commands.c @@ -57,7 +57,7 @@ static switch_api_interface_t sched_broadcast_api_interface; static switch_api_interface_t sched_transfer_api_interface; static switch_api_interface_t sched_hangup_api_interface; -static switch_status_t status_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t status_function(const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { uint8_t html = 0; switch_core_time_duration_t duration; @@ -107,7 +107,7 @@ static switch_status_t status_function(char *cmd, switch_core_session_t *session return SWITCH_STATUS_SUCCESS; } -static switch_status_t ctl_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t ctl_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) { int argc; char *mydata, *argv[5]; @@ -149,7 +149,7 @@ static switch_status_t ctl_function(char *data, switch_core_session_t *session, } -static switch_status_t load_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t load_function(const char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) { const char *err; @@ -171,7 +171,7 @@ static switch_status_t load_function(char *mod, switch_core_session_t *session, return SWITCH_STATUS_SUCCESS; } -static switch_status_t unload_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t unload_function(const char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) { const char *err; @@ -193,7 +193,7 @@ static switch_status_t unload_function(char *mod, switch_core_session_t *session return SWITCH_STATUS_SUCCESS; } -static switch_status_t reload_function(char *args, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t reload_function(const char *args, switch_core_session_t *session, switch_stream_handle_t *stream) { const char *err; switch_xml_t xml_root; @@ -211,7 +211,7 @@ static switch_status_t reload_function(char *args, switch_core_session_t *sessio return SWITCH_STATUS_SUCCESS; } -static switch_status_t kill_function(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t kill_function(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; @@ -233,56 +233,62 @@ static switch_status_t kill_function(char *dest, switch_core_session_t *isession return SWITCH_STATUS_SUCCESS; } -static switch_status_t transfer_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t transfer_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; if (isession) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (argc >= 2 && argc <= 4) { + char *uuid = argv[0]; + char *dest = argv[1]; + char *dp = argv[2]; + char *context = argv[3]; - if (switch_strlen_zero(cmd) || argc < 2 || argc > 4) { - stream->write_function(stream, "USAGE: %s\n", transfer_api_interface.syntax); - } else { - char *uuid = argv[0]; - char *dest = argv[1]; - char *dp = argv[2]; - char *context = argv[3]; + if ((session = switch_core_session_locate(uuid))) { - if ((session = switch_core_session_locate(uuid))) { + if (switch_ivr_session_transfer(session, dest, dp, context) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "OK\n"); + } else { + stream->write_function(stream, "ERROR\n"); + } + + switch_core_session_rwunlock(session); - if (switch_ivr_session_transfer(session, dest, dp, context) == SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "OK\n"); } else { - stream->write_function(stream, "ERROR\n"); + stream->write_function(stream, "No Such Channel!\n"); } - - switch_core_session_rwunlock(session); - - } else { - stream->write_function(stream, "No Such Channel!\n"); + goto done; } } + stream->write_function(stream, "USAGE: %s\n", transfer_api_interface.syntax); + +done: + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_transfer_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sched_transfer_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; - char *argv[6] = { 0 }; + char *mycmd = NULL, *argv[6] = { 0 }; int argc = 0; if (isession) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2 || argc > 5) { stream->write_function(stream, "USAGE: %s\n", sched_transfer_api_interface.syntax); @@ -308,20 +314,23 @@ static switch_status_t sched_transfer_function(char *cmd, switch_core_session_t } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_hangup_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sched_hangup_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; if (isession) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 1) { stream->write_function(stream, "USAGE: %s\n", sched_hangup_api_interface.syntax); @@ -350,13 +359,14 @@ static switch_status_t sched_hangup_function(char *cmd, switch_core_session_t *i } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_media_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t uuid_media_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; @@ -364,7 +374,9 @@ static switch_status_t uuid_media_function(char *cmd, switch_core_session_t *ise return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 1) { stream->write_function(stream, "USAGE: %s\n", media_api_interface.syntax); @@ -382,13 +394,14 @@ static switch_status_t uuid_media_function(char *cmd, switch_core_session_t *ise stream->write_function(stream, "-ERR Operation Failed\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_broadcast_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t uuid_broadcast_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; @@ -396,7 +409,9 @@ static switch_status_t uuid_broadcast_function(char *cmd, switch_core_session_t return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2) { stream->write_function(stream, "USAGE: %s\n", broadcast_api_interface.syntax); @@ -419,13 +434,14 @@ static switch_status_t uuid_broadcast_function(char *cmd, switch_core_session_t stream->write_function(stream, "+OK Message Sent\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_broadcast_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sched_broadcast_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; @@ -433,7 +449,9 @@ static switch_status_t sched_broadcast_function(char *cmd, switch_core_session_t return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 3) { stream->write_function(stream, "USAGE: %s\n", sched_broadcast_api_interface.syntax); @@ -463,12 +481,13 @@ static switch_status_t sched_broadcast_function(char *cmd, switch_core_session_t stream->write_function(stream, "+OK Message Scheduled\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_hold_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t uuid_hold_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; @@ -476,7 +495,9 @@ static switch_status_t uuid_hold_function(char *cmd, switch_core_session_t *ises return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 1) { stream->write_function(stream, "USAGE: %s\n", hold_api_interface.syntax); @@ -494,19 +515,22 @@ static switch_status_t uuid_hold_function(char *cmd, switch_core_session_t *ises stream->write_function(stream, "-ERR Operation Failed\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_bridge_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t uuid_bridge_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; if (isession) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc != 2) { stream->write_function(stream, "USAGE: %s\n", uuid_bridge_api_interface.syntax); @@ -516,13 +540,14 @@ static switch_status_t uuid_bridge_function(char *cmd, switch_core_session_t *is } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t session_record_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t session_record_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; char *uuid = NULL, *action = NULL, *path = NULL; int argc = 0; @@ -534,7 +559,11 @@ static switch_status_t session_record_function(char *cmd, switch_core_session_t goto usage; } - if ((argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 3) { + if (!(mycmd = strdup(cmd))) { + goto usage; + } + + if ((argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 3) { goto usage; } @@ -564,6 +593,7 @@ static switch_status_t session_record_function(char *cmd, switch_core_session_t usage: stream->write_function(stream, "USAGE: %s\n", session_record_api_interface.syntax); + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; done: @@ -572,20 +602,23 @@ static switch_status_t session_record_function(char *cmd, switch_core_session_t switch_core_session_rwunlock(session); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t pause_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t pause_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; if (isession) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2) { stream->write_function(stream, "USAGE: %s\n", pause_api_interface.syntax); @@ -609,14 +642,15 @@ static switch_status_t pause_function(char *cmd, switch_core_session_t *isession } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t originate_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t originate_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_channel_t *caller_channel; switch_core_session_t *caller_session = NULL; - char *argv[7] = { 0 }; + char *mycmd = NULL, *argv[7] = { 0 }; int i = 0, x, argc = 0; char *aleg, *exten, *dp, *context, *cid_name, *cid_num; uint32_t timeout = 60; @@ -628,10 +662,13 @@ static switch_status_t originate_function(char *cmd, switch_core_session_t *ises return SWITCH_STATUS_SUCCESS; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2 || argc > 7) { stream->write_function(stream, "USAGE: %s\n", originate_api_interface.syntax); + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } @@ -671,6 +708,7 @@ static switch_status_t originate_function(char *cmd, switch_core_session_t *ises } else { stream->write_function(stream, "Cannot Create Outgoing Channel! [%s] cause: %s\n", aleg, switch_channel_cause2str(cause)); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } @@ -694,6 +732,7 @@ static switch_status_t originate_function(char *cmd, switch_core_session_t *ises if ((extension = switch_caller_extension_new(caller_session, app_name, arg)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); switch_channel_hangup(caller_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + switch_safe_free(mycmd); return SWITCH_STATUS_MEMERR; } switch_caller_extension_add_application(caller_session, extension, app_name, arg); @@ -713,6 +752,7 @@ static switch_status_t originate_function(char *cmd, switch_core_session_t *ises switch_core_session_rwunlock(caller_session); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } @@ -735,7 +775,7 @@ static void sch_api_callback(switch_scheduler_task_t *task) switch_safe_free(stream.data); } -static switch_status_t sched_del_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sched_del_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { uint32_t cnt = 0; @@ -754,7 +794,7 @@ static switch_status_t sched_del_function(char *cmd, switch_core_session_t *ises return SWITCH_STATUS_SUCCESS; } -static switch_status_t xml_wrap_api_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t xml_wrap_api_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *dcommand, *edata = NULL, *send = NULL, *command, *arg = NULL; switch_stream_handle_t mystream = { 0 }; @@ -803,7 +843,7 @@ static switch_status_t xml_wrap_api_function(char *cmd, switch_core_session_t *i return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_api_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sched_api_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *tm = NULL, *dcmd, *group; time_t when; @@ -939,7 +979,7 @@ static int show_callback(void *pArg, int argc, char **argv, char **columnNames) return 0; } -static switch_status_t show_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t show_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) { char sql[1024]; char *errmsg; @@ -954,11 +994,8 @@ static switch_status_t show_function(char *data, switch_core_session_t *session, return SWITCH_STATUS_FALSE; } - if (data) { - if ((mydata = strdup(data))) { - argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - } - + if (data && (mydata = strdup(data))) { + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); cmd = argv[0]; if (argv[2] && !strcasecmp(argv[1], "as")) { as = argv[2]; @@ -1063,7 +1100,7 @@ static switch_status_t show_function(char *data, switch_core_session_t *session, return SWITCH_STATUS_SUCCESS; } -static switch_status_t version_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t version_function(const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { char version_string[1024]; snprintf(version_string, sizeof(version_string) - 1, "FreeSwitch Version %s\n", SWITCH_VERSION_FULL); @@ -1072,7 +1109,7 @@ static switch_status_t version_function(char *cmd, switch_core_session_t *sessio return SWITCH_STATUS_SUCCESS; } -static switch_status_t help_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t help_function(const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { char showcmd[1024]; int all = 0; diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index e81fa65929..bbdacd7a34 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -292,7 +292,7 @@ static uint32_t conference_stop_file(conference_obj_t * conference, file_stop_t static switch_status_t conference_play_file(conference_obj_t * conference, char *file, uint32_t leadin, switch_channel_t *channel, uint8_t async); static switch_status_t conference_say(conference_obj_t * conference, const char *text, uint32_t leadin); static void conference_list(conference_obj_t * conference, switch_stream_handle_t *stream, char *delim); -static switch_status_t conf_api_main(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t conf_api_main(const char *buf, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t audio_bridge_on_ring(switch_core_session_t *session); static switch_status_t conference_outcall(conference_obj_t * conference, char *conference_name, @@ -3445,7 +3445,7 @@ switch_status_t conf_api_dispatch(conference_obj_t * conference, switch_stream_h } /* API Interface Function */ -static switch_status_t conf_api_main(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t conf_api_main(const char *buf, switch_core_session_t *session, switch_stream_handle_t *stream) { char *lbuf = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c index a0910cfbe0..9071eec13d 100644 --- a/src/mod/applications/mod_dptools/mod_dptools.c +++ b/src/mod/applications/mod_dptools/mod_dptools.c @@ -502,7 +502,7 @@ static void strftime_function(switch_core_session_t *session, char *data) } -static switch_status_t strepoch_api_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t strepoch_api_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_time_t out; @@ -517,7 +517,7 @@ static switch_status_t strepoch_api_function(char *data, switch_core_session_t * return SWITCH_STATUS_SUCCESS; } -static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t strftime_api_function(const char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_size_t retsize; @@ -531,7 +531,7 @@ static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *s return SWITCH_STATUS_SUCCESS; } -static switch_status_t presence_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t presence_api_function(const char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_event_t *event; char *lbuf, *argv[4]; @@ -568,7 +568,7 @@ static switch_status_t presence_api_function(char *fmt, switch_core_session_t *s } -static switch_status_t chat_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t chat_api_function(const char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) { char *lbuf, *argv[4]; int argc = 0; diff --git a/src/mod/applications/mod_enum/mod_enum.c b/src/mod/applications/mod_enum/mod_enum.c index 98a39a0a8b..105ddc7572 100644 --- a/src/mod/applications/mod_enum/mod_enum.c +++ b/src/mod/applications/mod_enum/mod_enum.c @@ -625,7 +625,7 @@ static void enum_app_function(switch_core_session_t *session, char *data) } -static switch_status_t enum_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t enum_function(const char *data, switch_core_session_t *session, switch_stream_handle_t *stream) { int argc = 0; @@ -649,7 +649,7 @@ static switch_status_t enum_function(char *data, switch_core_session_t *session, dest = argv[0]; root = argv[1] ? argv[1] : globals.root; - if (!enum_lookup(root, data, &results) == SWITCH_STATUS_SUCCESS) { + if (!enum_lookup(root, dest, &results) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "No Match!\n"); return SWITCH_STATUS_SUCCESS; } diff --git a/src/mod/endpoints/mod_alsa/mod_alsa.c b/src/mod/endpoints/mod_alsa/mod_alsa.c index eed38b69bd..739d581eca 100644 --- a/src/mod/endpoints/mod_alsa/mod_alsa.c +++ b/src/mod/endpoints/mod_alsa/mod_alsa.c @@ -1522,7 +1522,7 @@ static switch_status_t place_call(char **argv, int argc, switch_stream_handle_t return SWITCH_STATUS_SUCCESS; } -static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t pa_cmd(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *argv[1024] = { 0 }; int argc = 0; diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c index 399676596e..1bd93eadef 100644 --- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c +++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c @@ -191,10 +191,10 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan) SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string) SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string) -static switch_status_t dl_login(char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); -static switch_status_t dl_logout(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); -static switch_status_t dl_pres(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); -static switch_status_t dl_debug(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_login(const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_logout(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_pres(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_debug(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t channel_on_init(switch_core_session_t *session); static switch_status_t channel_on_hangup(switch_core_session_t *session); static switch_status_t channel_on_ring(switch_core_session_t *session); @@ -2028,7 +2028,7 @@ static void set_profile_val(mdl_profile_t *profile, char *var, char *val) } } -static switch_status_t dl_debug(char *tf, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t dl_debug(const char *tf, switch_core_session_t *session, switch_stream_handle_t *stream) { int on, cur; @@ -2049,7 +2049,7 @@ static switch_status_t dl_debug(char *tf, switch_core_session_t *session, switch return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_pres(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t dl_pres(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) { mdl_profile_t *profile; @@ -2076,7 +2076,7 @@ static switch_status_t dl_pres(char *profile_name, switch_core_session_t *sessio return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_logout(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t dl_logout(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) { mdl_profile_t *profile; @@ -2099,7 +2099,7 @@ static switch_status_t dl_logout(char *profile_name, switch_core_session_t *sess return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_login(char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t dl_login(const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) { char *argv[10] = { 0 }; int argc = 0; diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c index ba540be271..cbecf6623f 100644 --- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c +++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c @@ -155,8 +155,8 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan) static switch_status_t load_config(void); static int get_dev_by_name(char *name, int in); static int get_dev_by_number(int number, int in); - static switch_status_t pa_cmd(char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); - static switch_status_t padep(char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t pa_cmd(const char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t padep(const char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); /* @@ -1711,13 +1711,13 @@ static switch_status_t place_call(char **argv, int argc, switch_stream_handle_t return SWITCH_STATUS_SUCCESS; } -static switch_status_t padep(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t padep(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { stream->write_function(stream, "This command no longer exists (try 'pa help')\n"); return SWITCH_STATUS_SUCCESS; } -static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t pa_cmd(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *argv[1024] = { 0 }; int argc = 0; diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index 1f9f15cb6a..08f8f7cc45 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -1175,7 +1175,7 @@ static switch_status_t cmd_profile(char **argv, int argc, switch_stream_handle_t return SWITCH_STATUS_SUCCESS; } -static switch_status_t sofia_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +static switch_status_t sofia_function(const char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *argv[1024] = { 0 }; int argc = 0; diff --git a/src/mod/event_handlers/mod_cdr/basecdr.h b/src/mod/event_handlers/mod_cdr/basecdr.h index 153591750a..d20223d6e0 100644 --- a/src/mod/event_handlers/mod_cdr/basecdr.h +++ b/src/mod/event_handlers/mod_cdr/basecdr.h @@ -90,7 +90,7 @@ class BaseCDR { switch_time_t callenddate; switch_time_t calltransferdate; switch_call_cause_t hangupcause; - char *hangupcause_text; + const char *hangupcause_text; char clid[80]; bool originated; // Did they originate this call? char dialplan[80]; diff --git a/src/mod/event_handlers/mod_cdr/mod_cdr.cpp b/src/mod/event_handlers/mod_cdr/mod_cdr.cpp index 4507d68b1b..730c7270c0 100644 --- a/src/mod/event_handlers/mod_cdr/mod_cdr.cpp +++ b/src/mod/event_handlers/mod_cdr/mod_cdr.cpp @@ -45,11 +45,11 @@ static int RUNNING = 0; static CDRContainer *newcdrcontainer; static switch_memory_pool_t *module_pool; static switch_status_t my_on_hangup(switch_core_session_t *session); -static switch_status_t modcdr_reload(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_queue_pause(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_queue_resume(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_show_active(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_show_available(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_reload(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_queue_pause(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_queue_resume(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_show_active(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_show_available(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); static switch_thread_rwlock_t *cdr_rwlock; /* Now begins the glue that will tie this into the system. @@ -151,7 +151,7 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void) return RUNNING ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_TERM; } -static switch_status_t modcdr_reload(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +static switch_status_t modcdr_reload(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) { #ifdef SWITCH_QUEUE_ENHANCED switch_thread_rwlock_wrlock(cdr_rwlock); @@ -164,7 +164,7 @@ static switch_status_t modcdr_reload(char *dest=0, switch_core_session_t *isessi return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_queue_pause(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +static switch_status_t modcdr_queue_pause(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) { #ifdef SWITCH_QUEUE_ENHANCED newcdrcontainer->queue_pause(stream); @@ -174,7 +174,7 @@ static switch_status_t modcdr_queue_pause(char *dest=0, switch_core_session_t *i return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_queue_resume(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +static switch_status_t modcdr_queue_resume(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) { #ifdef SWITCH_QUEUE_ENHANCED newcdrcontainer->queue_resume(stream); @@ -184,13 +184,13 @@ static switch_status_t modcdr_queue_resume(char *dest=0, switch_core_session_t * return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_show_active(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +static switch_status_t modcdr_show_active(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) { newcdrcontainer->active(stream); return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_show_available(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +static switch_status_t modcdr_show_available(const char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) { newcdrcontainer->available(stream); return SWITCH_STATUS_SUCCESS; diff --git a/src/mod/languages/mod_python/mod_python.c b/src/mod/languages/mod_python/mod_python.c index f1c1742ee4..a7f5015f59 100644 --- a/src/mod/languages/mod_python/mod_python.c +++ b/src/mod/languages/mod_python/mod_python.c @@ -161,7 +161,7 @@ static void *SWITCH_THREAD_FUNC py_thread_run(switch_thread_t *thread, void *obj return NULL; } -static switch_status_t launch_python(char *text, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t launch_python(const char *text, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c index 9104d083bd..632c99145a 100644 --- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c +++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c @@ -2720,7 +2720,7 @@ static void *SWITCH_THREAD_FUNC js_thread_run(switch_thread_t * thread, void *ob static switch_memory_pool_t *module_pool = NULL; -static void js_thread_launch(char *text) +static void js_thread_launch(const char *text) { switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; @@ -2739,7 +2739,7 @@ static void js_thread_launch(char *text) } -static switch_status_t launch_async(char *text, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t launch_async(const char *text, switch_core_session_t *session, switch_stream_handle_t *stream) { if (switch_strlen_zero(text)) { diff --git a/src/switch_buffer.c b/src/switch_buffer.c index 55be4e2e0c..5e5889bb74 100644 --- a/src/switch_buffer.c +++ b/src/switch_buffer.c @@ -193,7 +193,7 @@ SWITCH_DECLARE(switch_size_t) switch_buffer_read(switch_buffer_t *buffer, void * return reading; } -SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, void *data, switch_size_t datalen) +SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, const void *data, switch_size_t datalen) { switch_size_t freespace, actual_freespace; diff --git a/src/switch_caller.c b/src/switch_caller.c index 2663f5e68f..3aab596fe8 100644 --- a/src/switch_caller.c +++ b/src/switch_caller.c @@ -92,7 +92,7 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_clone(switch_cor return profile; } -SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, char *name) +SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, const char *name) { if (!strcasecmp(name, "dialplan")) { return caller_profile->dialplan; @@ -136,7 +136,7 @@ SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t * return NULL; } -SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, char *prefix, switch_event_t *event) +SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, const char *prefix, switch_event_t *event) { char header_name[1024]; @@ -207,7 +207,7 @@ SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_ } -SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, char *extension_name, char *extension_number) +SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, const char *extension_name, const char *extension_number) { switch_caller_extension_t *caller_extension = NULL; @@ -222,7 +222,7 @@ SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_c SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session_t *session, - switch_caller_extension_t *caller_extension, char *application_name, char *application_data) + switch_caller_extension_t *caller_extension, const char *application_name, const char *application_data) { switch_caller_application_t *caller_application = NULL; diff --git a/src/switch_channel.c b/src/switch_channel.c index 2cbed3759f..9948a73521 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -119,21 +119,21 @@ struct switch_channel { }; -SWITCH_DECLARE(char *) switch_channel_cause2str(switch_call_cause_t cause) +SWITCH_DECLARE(const char *) switch_channel_cause2str(switch_call_cause_t cause) { uint8_t x; - char *str = "UNKNOWN"; + const char *str = "UNKNOWN"; for (x = 0; CAUSE_CHART[x].name; x++) { if (CAUSE_CHART[x].cause == cause) { - str = (char *) CAUSE_CHART[x].name; + str = CAUSE_CHART[x].name; } } return str; } -SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(char *str) +SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(const char *str) { uint8_t x; switch_call_cause_t cause = SWITCH_CAUSE_UNALLOCATED; @@ -198,12 +198,12 @@ SWITCH_DECLARE(switch_size_t) switch_channel_has_dtmf(switch_channel_t *channel) return has; } -SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, char *dtmf) +SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, const char *dtmf) { switch_status_t status; register switch_size_t len, inuse; switch_size_t wr = 0; - char *p; + const char *p; assert(channel != NULL); @@ -270,7 +270,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_init(switch_channel_t *channel, s return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, char *rpid, char *status) +SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, const char *rpid, const char *status) { char *id = switch_channel_get_variable(channel, "presence_id"); switch_event_t *event; @@ -302,7 +302,7 @@ SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, char *rp } -SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, char *varname) +SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, const char *varname) { char *v = NULL; assert(channel != NULL); @@ -343,7 +343,7 @@ SWITCH_DECLARE(switch_hash_index_t *) switch_channel_variable_first(switch_chann return hi; } -SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, char *key, void *private_info) +SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, const char *key, const void *private_info) { assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); @@ -352,7 +352,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *cha return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, char *key) +SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key) { void *val; assert(channel != NULL); @@ -362,7 +362,7 @@ SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, cha return val; } -SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, char *name) +SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, const char *name) { assert(channel != NULL); channel->name = NULL; @@ -532,7 +532,7 @@ SWITCH_DECLARE(const char *) switch_channel_state_name(switch_channel_state_t st } -SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(char *name) +SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(const char *name) { uint32_t x = 0; for (x = 0; state_names[x]; x++) { diff --git a/src/switch_core.c b/src/switch_core.c index 022b101efd..b9f7e714e2 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -80,7 +80,7 @@ static void heartbeat_callback(switch_scheduler_task_t *task) } -SWITCH_DECLARE(switch_status_t) switch_core_set_console(char *console) +SWITCH_DECLARE(switch_status_t) switch_core_set_console(const char *console) { if ((runtime.console = fopen(console, "a")) == 0) { fprintf(stderr, "Cannot open output file %s.\n", console); @@ -135,12 +135,12 @@ SWITCH_DECLARE(const switch_state_handler_table_t *) switch_core_get_state_handl } -SWITCH_DECLARE(char *) switch_core_get_variable(char *varname) +SWITCH_DECLARE(char *) switch_core_get_variable(const char *varname) { return (char *) switch_core_hash_find(runtime.global_vars, varname); } -SWITCH_DECLARE(void) switch_core_set_variable(char *varname, char *value) +SWITCH_DECLARE(void) switch_core_set_variable(const char *varname, const char *value) { switch_core_hash_insert(runtime.global_vars, switch_core_strdup(runtime.memory_pool, varname), switch_core_strdup(runtime.memory_pool, value)); } @@ -392,7 +392,7 @@ SWITCH_DECLARE(void) switch_core_runtime_loop(int bg) } -SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err) +SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, const char **err) { switch_xml_t xml = NULL, cfg = NULL; switch_uuid_t uuid; @@ -538,7 +538,7 @@ static void handle_SIGINT(int sig) if (sig); return; } -SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, const char **err) +SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(const char *console, const char **err) { switch_event_t *event; if (switch_core_init(console, err) != SWITCH_STATUS_SUCCESS) { diff --git a/src/switch_core_session.c b/src/switch_core_session.c index 938756b9e7..39bb276e0c 100644 --- a/src/switch_core_session.c +++ b/src/switch_core_session.c @@ -45,9 +45,9 @@ static struct { #ifdef SWITCH_DEBUG_RWLOCKS -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(char *uuid_str, const char *file, const char *func, int line) +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(const char *uuid_str, const char *file, const char *func, int line) #else -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(char *uuid_str) +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(const char *uuid_str) #endif { switch_core_session_t *session = NULL; diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c index 3c13821ddf..352483f691 100644 --- a/src/switch_loadable_module.c +++ b/src/switch_loadable_module.c @@ -1110,7 +1110,7 @@ SWITCH_DECLARE(void) switch_loadable_module_shutdown(void) } -SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(char *name) +SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(const char *name) { switch_endpoint_interface_t *ptr; @@ -1121,7 +1121,7 @@ SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoin return ptr; } -SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(char *name) +SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(const char *name) { char altname[256] = ""; switch_codec_interface_t *codec; @@ -1143,57 +1143,57 @@ SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_inte return codec; } -SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(char *name) +SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.dialplan_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(char *name) +SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.timer_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(char *name) +SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.application_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(char *name) +SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.api_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(char *name) +SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.file_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(char *name) +SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.speech_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(char *name) +SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.asr_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(char *name) +SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.directory_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(char *name) +SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.chat_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(char *name) +SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.say_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(char *relative_oid) +SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(const char *relative_oid) { return switch_core_hash_find_locked(loadable_modules.management_hash, relative_oid, loadable_modules.mutex); } @@ -1319,7 +1319,7 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_ return i; } -SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_DECLARE(switch_status_t) switch_api_execute(const char *cmd, const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_api_interface_t *api; switch_status_t status; diff --git a/src/switch_regex.c b/src/switch_regex.c index bce68b7d82..c9df9f4b50 100644 --- a/src/switch_regex.c +++ b/src/switch_regex.c @@ -32,12 +32,19 @@ #include #include - SWITCH_DECLARE(switch_regex_t *) switch_regex_compile(const char *pattern, - int options, const char **errorptr, int *erroroffset, const unsigned char *tables) + + +SWITCH_DECLARE(switch_regex_t *) switch_regex_compile(const char *pattern, + int options, const char **errorptr, int *erroroffset, +const unsigned char *tables) { - return pcre_compile(pattern, options, errorptr, erroroffset, tables); - } - SWITCH_DECLARE(int) switch_regex_copy_substring(const char *subject, int *ovector, int stringcount, int stringnumber, char *buffer, int size) + +return pcre_compile(pattern, options, errorptr, erroroffset, tables); + +} + + +SWITCH_DECLARE(int) switch_regex_copy_substring(const char *subject, int *ovector, int stringcount, int stringnumber, char *buffer, int size) { return pcre_copy_substring(subject, ovector, stringcount, stringnumber, buffer, size); } @@ -45,7 +52,10 @@ SWITCH_DECLARE(void) switch_regex_free(void *data) { pcre_free(data); - } SWITCH_DECLARE(int) switch_regex_perform(char *field, char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen) + +} + +SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen) { const char *error = NULL; int erroffset = 0; @@ -87,7 +97,7 @@ SWITCH_DECLARE(void) switch_regex_free(void *data) } -SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, char *data, char *field_data, +SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data, char *substituted, uint32_t len, int *ovector) { char index[10] = ""; @@ -124,7 +134,8 @@ SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_c } substituted[y++] = '\0'; } - SWITCH_DECLARE(switch_status_t) switch_regex_match(char *target, char *expression) + +SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const char *expression) { const char *error = NULL; //Used to hold any errors int error_offset = 0; //Holds the offset of an error diff --git a/src/switch_rtp.c b/src/switch_rtp.c index 9fc9a64a3b..2b1fa21bdd 100644 --- a/src/switch_rtp.c +++ b/src/switch_rtp.c @@ -319,7 +319,7 @@ SWITCH_DECLARE(switch_port_t) switch_rtp_request_port(void) } -SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err) +SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err) { switch_socket_t *new_sock = NULL, *old_sock = NULL; switch_status_t status = SWITCH_STATUS_FALSE; @@ -389,7 +389,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_s return status; } -SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err) +SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err) { *err = "Success"; @@ -545,9 +545,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(char *rx_host, +SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(const char *rx_host, switch_port_t rx_port, - char *tx_host, + const char *tx_host, switch_port_t tx_port, switch_payload_t payload, uint32_t samples_per_interval, diff --git a/src/switch_scheduler.c b/src/switch_scheduler.c index a829f0cd79..42aee0048b 100644 --- a/src/switch_scheduler.c +++ b/src/switch_scheduler.c @@ -149,7 +149,7 @@ static void *SWITCH_THREAD_FUNC switch_scheduler_task_thread(switch_thread_t * t SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime, switch_scheduler_func_t func, - char *desc, char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags) + const char *desc, const char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags) { switch_scheduler_task_container_t *container, *tp; switch_event_t *event; @@ -223,7 +223,7 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_id(uint32_t task_id) return delcnt; } -SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(char *group) +SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(const char *group) { switch_scheduler_task_container_t *tp; switch_event_t *event; diff --git a/src/switch_utils.c b/src/switch_utils.c index 58daad98ac..71c841de49 100644 --- a/src/switch_utils.c +++ b/src/switch_utils.c @@ -177,7 +177,7 @@ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int fam } -SWITCH_DECLARE(switch_time_t) switch_str_time(char *in) +SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in) { switch_time_exp_t tm = { 0 }; int proceed = 0, ovector[30]; @@ -229,7 +229,7 @@ SWITCH_DECLARE(switch_time_t) switch_str_time(char *in) } -SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) +SWITCH_DECLARE(const char *) switch_priority_name(switch_priority_t priority) { switch (priority) { /*lol */ case SWITCH_PRIORITY_NORMAL: @@ -284,9 +284,10 @@ SWITCH_DECLARE(unsigned char) switch_char_to_rfc2833(char key) return '\0'; } -SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, char *delim, char esc) +SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, const char *delim, char esc) { - char *data, *p, *d; + char *data; + const char *p, *d; int count = 1, i = 0; p = in;