fix some code analysis tags

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16592 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index 20a465a49d3ffdd2c19087d1ed62ae5f71454b2c..c2688d0f413d74b2674fc8821b4096913d68b466 100644 (file)
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -857,7 +857,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(_In_ switch_core_sessio
   \return the application's return value
 */
 SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application_get_flags(_In_ switch_core_session_t *session,
-                                                                                                                                                                 _In_ const char *app, _In_opt_z_ const char *arg, _Out_ int32_t *flags);
+                                                                                                                                                                 _In_ const char *app, _In_opt_z_ const char *arg, _Out_opt_ int32_t *flags);
 
 SWITCH_DECLARE(switch_status_t) switch_core_session_get_app_flags(const char *app, int32_t *flags);
 

diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h
index 8b5d60bf82b9c6992a209fd4cba0c6c107f5114f..c1ad51f92ec5bd6042639ee9021a290b91eed2b8 100644 (file)
--- a/src/include/switch_platform.h
+++ b/src/include/switch_platform.h
@@ -338,6 +338,7 @@ SWITCH_END_EXTERN_C
 #define _Out_z_cap_(x)
 #define _Out_ptrdiff_cap_(x)
 #define _Out_opt_ptrdiff_cap_(x)
+#define _Post_count_(x)
 #endif
 /* For Emacs:
  * Local Variables:

diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 91027d59f658014a6b29df3ac88bc5df609e3ac0..0872d7a64cd842959eff57eb3ec00ffda3e38957 100644 (file)
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -72,11 +72,15 @@ SWITCH_DECLARE(int) switch_isxdigit(int c);
   \param s the string to test
   \return true value if the string is NULL or zero length
 */
-        static inline int zstr(const char *s)
+_Check_return_ static inline switch_bool_t _zstr(_In_opt_z_ const char *s)
 {
        return !s || *s == '\0';
 }
-
+#ifdef _PREFAST_
+#define zstr(x) (_zstr(x) ? 1 : __analysis_assume(x),0)
+#else
+#define zstr(x) _zstr(x)
+#endif
 #define switch_strlen_zero(x) zstr(x)
 #define switch_strlen_zero_buf(x) zstr_buf(x)
 #define zstr_buf(s) (*(s) == '\0')
@@ -113,7 +117,7 @@ SWITCH_DECLARE(switch_status_t) switch_b64_encode(unsigned char *in, switch_size
 SWITCH_DECLARE(switch_size_t) switch_b64_decode(char *in, char *out, switch_size_t olen);
 SWITCH_DECLARE(char *) switch_amp_encode(char *s, char *buf, switch_size_t len);
 
-        static inline switch_bool_t switch_is_digit_string(const char *s)
+static inline switch_bool_t switch_is_digit_string(const char *s)
 {
 
        while (s && *s) {
@@ -536,8 +540,8 @@ SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in);
   \param arraylen the max number of elements in the array
   \return the number of elements added to the array
 */
-SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, unsigned int arraylen);
-SWITCH_DECLARE(unsigned int) switch_separate_string_string(char *buf, char *delim, char **array, unsigned int arraylen);
+SWITCH_DECLARE(unsigned int) switch_separate_string(_In_ char *buf, char delim, _Post_count_(return) char **array, unsigned int arraylen);
+SWITCH_DECLARE(unsigned int) switch_separate_string_string(char *buf, char *delim, _Post_count_(return) char **array, unsigned int arraylen);
 
 SWITCH_DECLARE(switch_bool_t) switch_is_number(const char *str);
 SWITCH_DECLARE(char *) switch_strip_spaces(const char *str);