kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup msvc code analysis warnings 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13366 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-05-15 21:07:18 +00:00
parent ceae13acc0
commit 383ff711d2
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_xml.h
View File

@ -240,7 +240,7 @@ SWITCH_DECLARE(const char *) switch_xml_error(_In_ switch_xml_t xml);
///\brief returns a new empty switch_xml structure with the given root tag name ///\brief returns a new empty switch_xml structure with the given root tag name
///\param name the name of the new root tag ///\param name the name of the new root tag
SWITCH_DECLARE(switch_xml_t) switch_xml_new(_In_z_ const char *name); SWITCH_DECLARE(switch_xml_t) switch_xml_new(_In_opt_z_ const char *name);
///\brief wrapper for switch_xml_new() that strdup()s name ///\brief wrapper for switch_xml_new() that strdup()s name
///\param name the name of the root ///\param name the name of the root

2
src/switch_utils.c
View File

@ -83,6 +83,8 @@ SWITCH_DECLARE(switch_status_t) switch_frame_dup(switch_frame_t *orig, switch_fr
switch_frame_t *new_frame; switch_frame_t *new_frame;
new_frame = malloc(sizeof(*new_frame)); new_frame = malloc(sizeof(*new_frame));
switch_assert(new_frame);
*new_frame = *orig; *new_frame = *orig;
switch_set_flag(new_frame, SFF_DYNAMIC); switch_set_flag(new_frame, SFF_DYNAMIC);

10
src/switch_xml.c
View File

@ -391,17 +391,17 @@ SWITCH_DECLARE(const char *) switch_xml_attr(switch_xml_t xml, const char *attr)
if (!xml || !xml->attr) if (!xml || !xml->attr)
return NULL; return NULL;
while (xml->attr[i] && strcmp(attr, xml->attr[i])) while (xml->attr[i] && attr && strcmp(attr, xml->attr[i]))
i += 2; i += 2;
if (xml->attr[i]) if (xml->attr[i])
return xml->attr[i + 1]; /* found attribute */ return xml->attr[i + 1]; /* found attribute */
while (root->xml.parent) while (root->xml.parent)
root = (switch_xml_root_t) root->xml.parent; /* root tag */ root = (switch_xml_root_t) root->xml.parent; /* root tag */
for (i = 0; root->attr[i] && strcmp(xml->name, root->attr[i][0]); i++); for (i = 0; root->attr[i] && xml->name && strcmp(xml->name, root->attr[i][0]); i++);
if (!root->attr[i]) if (!root->attr[i])
return NULL; /* no matching default attributes */ return NULL; /* no matching default attributes */
while (root->attr[i][j] && strcmp(attr, root->attr[i][j])) while (root->attr[i][j] && attr && strcmp(attr, root->attr[i][j]))
j += 3; j += 3;
return (root->attr[i][j]) ? root->attr[i][j + 1] : NULL; /* found default */ return (root->attr[i][j]) ? root->attr[i][j + 1] : NULL; /* found default */
} }
@ -2140,6 +2140,7 @@ SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml, switch_bool_t prn_head
char *r, *s; char *r, *s;
switch_mutex_lock(XML_GEN_LOCK); switch_mutex_lock(XML_GEN_LOCK);
s = (char *)malloc(SWITCH_XML_BUFSIZE); s = (char *)malloc(SWITCH_XML_BUFSIZE);
switch_assert(s);
r = switch_xml_toxml_buf(xml, s, SWITCH_XML_BUFSIZE, 0, prn_header); r = switch_xml_toxml_buf(xml, s, SWITCH_XML_BUFSIZE, 0, prn_header);
switch_mutex_unlock(XML_GEN_LOCK); switch_mutex_unlock(XML_GEN_LOCK);
return r; return r;
@ -2251,6 +2252,9 @@ tailrecurse:
/*switch_xml_free(xml->ordered);*/ /*switch_xml_free(xml->ordered);*/
if (!xml->parent) { /* free root tag allocations */ if (!xml->parent) { /* free root tag allocations */
#if (_MSC_VER >= 1400) // VC8+
__analysis_assume(sizeof(root->ent) > 44); /* tail recursion confuses code analysis */
#endif
for (i = 10; root->ent[i]; i += 2) /* 0 - 9 are default entities (<>&"') */ for (i = 10; root->ent[i]; i += 2) /* 0 - 9 are default entities (<>&"') */
if ((s = root->ent[i + 1]) < root->s || s > root->e) if ((s = root->ent[i + 1]) < root->s || s > root->e)
free(s); free(s);

16
w32/Library/FreeSwitchCore.2008.vcproj
View File

@ -713,6 +713,22 @@
<File <File
RelativePath="..\..\src\switch_ivr_originate.c" RelativePath="..\..\src\switch_ivr_originate.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/analyze:stacksize17000"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/analyze:stacksize17000"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\switch_ivr_play_say.c" RelativePath="..\..\src\switch_ivr_play_say.c"