From ddb345636a31696037909cf6230df1d4f7b7c6f5 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Fri, 1 Apr 2011 17:38:58 -0500
Subject: [PATCH] FS-3220: more than just typos

---
 src/include/switch.h                            | 5 +++++
 src/include/switch_core.h                       | 2 +-
 src/include/switch_utils.h                      | 6 +++---
 src/mod/endpoints/mod_portaudio/mod_portaudio.c | 4 ++--
 src/mod/endpoints/mod_sofia/sofia.c             | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/include/switch.h b/src/include/switch.h
index ce2ba7867f..de099f1b94 100644
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -150,6 +150,7 @@
  *
  *  - Linux (x86 & x86_64)
  *  - Windows (MSVC 2008 & VC++ EE 2008)
+ *  - Windows (MSVC 2010 & VC++ EE 2010)
  *  - Mac OS X (intel & ppc )
  *  - FreeBSD 6
  *
@@ -176,6 +177,10 @@
  *	mod_pocketsphinx
  *		- PocketSphinx (http://www.speech.cs.cmu.edu/pocketsphinx/)
  *
+ *	mod_unimrcp
+ *		- MRCP (http://www.unimrcp.org/)
+ *
+ *
  *  Codecs
  *	mod_speex
  *		- libspeex (http://www.speex.org/)
diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index 2946478c89..684cc4f777 100644
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -1183,7 +1183,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_recv_dtmf(_In_ switch_core_s
 ///\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 pool the pool to use for the new hash
   \return SWITCH_STATUS_SUCCESS if the hash is created
diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 1f65b0ff43..b08c204889 100644
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -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)
 
 /*!
-  \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 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);
 		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 delim the character delimeter
+  \param delim the character delimiter
   \param array the array to split the values into
   \param arraylen the max number of elements in the array
   \return the number of elements added to the array
diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index baa33d456e..c710fc352a 100644
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@ -1198,14 +1198,14 @@ static switch_status_t load_config(void)
 		if (globals.outdev > -1) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Switching to default output device\n");
 		} 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;
 		}
 	}
 
 	if (globals.ringdev < 0) {
 		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;
 		}
 	}
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 23f1fd0e88..b9aec74563 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -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 */
 		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) &&
 			!strcasecmp(sip->sip_content_type->c_subtype, "update_display")) {
 			sofia_update_callee_id(session, profile, sip, SWITCH_TRUE);