提交 ddb34563 authored 作者: Brian West's avatar Brian West

FS-3220: more than just typos

上级 d4722b4b
...@@ -150,6 +150,7 @@ ...@@ -150,6 +150,7 @@
* *
* - Linux (x86 & x86_64) * - Linux (x86 & x86_64)
* - Windows (MSVC 2008 & VC++ EE 2008) * - Windows (MSVC 2008 & VC++ EE 2008)
* - Windows (MSVC 2010 & VC++ EE 2010)
* - Mac OS X (intel & ppc ) * - Mac OS X (intel & ppc )
* - FreeBSD 6 * - FreeBSD 6
* *
...@@ -176,6 +177,10 @@ ...@@ -176,6 +177,10 @@
* mod_pocketsphinx * mod_pocketsphinx
* - PocketSphinx (http://www.speech.cs.cmu.edu/pocketsphinx/) * - PocketSphinx (http://www.speech.cs.cmu.edu/pocketsphinx/)
* *
* mod_unimrcp
* - MRCP (http://www.unimrcp.org/)
*
*
* Codecs * Codecs
* mod_speex * mod_speex
* - libspeex (http://www.speex.org/) * - libspeex (http://www.speex.org/)
......
...@@ -1183,7 +1183,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_recv_dtmf(_In_ switch_core_s ...@@ -1183,7 +1183,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_recv_dtmf(_In_ switch_core_s
///\ingroup core1 ///\ingroup core1
///\{ ///\{
/*! /*!
\brief Initilize a hash table \brief Initialize a hash table
\param hash a NULL pointer to a hash table to aim at the new hash \param hash a NULL pointer to a hash table to aim at the new hash
\param pool the pool to use for the new hash \param pool the pool to use for the new hash
\return SWITCH_STATUS_SUCCESS if the hash is created \return SWITCH_STATUS_SUCCESS if the hash is created
......
...@@ -635,7 +635,7 @@ SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in); ...@@ -635,7 +635,7 @@ SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in);
#define switch_time_from_sec(sec) ((switch_time_t)(sec) * 1000000) #define switch_time_from_sec(sec) ((switch_time_t)(sec) * 1000000)
/*! /*!
\brief Declares a function designed to set a dymaic global string \brief Declares a function designed to set a dynamic global string
\param fname the function name to declare \param fname the function name to declare
\param vname the name of the global pointer to modify with the new function \param vname the name of the global pointer to modify with the new function
*/ */
...@@ -643,9 +643,9 @@ SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in); ...@@ -643,9 +643,9 @@ SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in);
if (vname) {free(vname); vname = NULL;}vname = strdup(string);} static void fname(const char *string) if (vname) {free(vname); vname = NULL;}vname = strdup(string);} static void fname(const char *string)
/*! /*!
\brief Separate a string into an array based on a character delimeter \brief Separate a string into an array based on a character delimiter
\param buf the string to parse \param buf the string to parse
\param delim the character delimeter \param delim the character delimiter
\param array the array to split the values into \param array the array to split the values into
\param arraylen the max number of elements in the array \param arraylen the max number of elements in the array
\return the number of elements added to the array \return the number of elements added to the array
......
...@@ -1198,14 +1198,14 @@ static switch_status_t load_config(void) ...@@ -1198,14 +1198,14 @@ static switch_status_t load_config(void)
if (globals.outdev > -1) { if (globals.outdev > -1) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Switching to default output device\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Switching to default output device\n");
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find an input device\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find an output device\n");
status = SWITCH_STATUS_GENERR; status = SWITCH_STATUS_GENERR;
} }
} }
if (globals.ringdev < 0) { if (globals.ringdev < 0) {
if (globals.outdev > -1) { if (globals.outdev > -1) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid ring device configured using output device\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid or no ring device configured, using output device as ring device\n");
globals.ringdev = globals.outdev; globals.ringdev = globals.outdev;
} }
} }
......
...@@ -6151,7 +6151,7 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t ...@@ -6151,7 +6151,7 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t
/* Barf if we didn't get our private */ /* Barf if we didn't get our private */
assert(switch_core_session_get_private(session)); assert(switch_core_session_get_private(session));
if (sip->sip_content_type && sip->sip_content_type->c_subtype && sip->sip_content_type->c_type && if (sip && sip->sip_content_type && sip->sip_content_type->c_subtype && sip->sip_content_type->c_type &&
!strncasecmp(sip->sip_content_type->c_type, "message", 7) && !strncasecmp(sip->sip_content_type->c_type, "message", 7) &&
!strcasecmp(sip->sip_content_type->c_subtype, "update_display")) { !strcasecmp(sip->sip_content_type->c_subtype, "update_display")) {
sofia_update_callee_id(session, profile, sip, SWITCH_TRUE); sofia_update_callee_id(session, profile, sip, SWITCH_TRUE);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论