Tue May 20 09:29:34 EDT 2008 Pekka.Pessi@nokia.com
* sdp: Fixed klocwork issues. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8610 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
cda4ee31af
commit
e1f98ec1ad
|
@ -1 +1 @@
|
|||
Sun May 25 09:52:56 EDT 2008
|
||||
Sun May 25 09:53:58 EDT 2008
|
||||
|
|
|
@ -98,7 +98,7 @@ static const struct sdp_parser_s no_mem_error =
|
|||
|
||||
/* Internal prototypes */
|
||||
static void parse_message(sdp_parser_t *p);
|
||||
static void parsing_error(sdp_parser_t *p, char const *fmt, ...);
|
||||
static int parsing_error(sdp_parser_t *p, char const *fmt, ...);
|
||||
|
||||
/** Parse an SDP message.
|
||||
*
|
||||
|
@ -357,7 +357,7 @@ static void parse_message(sdp_parser_t *p)
|
|||
if (!STRICT(p))
|
||||
strip = SPACE TAB; /* skip initial whitespace */
|
||||
else
|
||||
strip = NULL;
|
||||
strip = "";
|
||||
|
||||
p->pr_ok = 1;
|
||||
p->pr_session->sdp_size = sizeof(p->pr_session);
|
||||
|
@ -550,18 +550,15 @@ int sdp_sanity_check(sdp_parser_t *p)
|
|||
sdp_media_t *m;
|
||||
|
||||
if (!p || !p->pr_ok)
|
||||
;
|
||||
else if (sdp->sdp_version[0] != 0)
|
||||
parsing_error(p, "Incorrect version");
|
||||
else if (!sdp->sdp_origin)
|
||||
parsing_error(p, "No o= present");
|
||||
else if (p->pr_strict && !sdp->sdp_subject)
|
||||
parsing_error(p, "No s= present");
|
||||
else if (p->pr_strict && !sdp->sdp_time)
|
||||
parsing_error(p, "No t= present");
|
||||
|
||||
if (!p->pr_ok)
|
||||
return -1;
|
||||
else if (sdp->sdp_version[0] != 0)
|
||||
return parsing_error(p, "Incorrect version");
|
||||
else if (!sdp->sdp_origin)
|
||||
return parsing_error(p, "No o= present");
|
||||
else if (p->pr_strict && !sdp->sdp_subject)
|
||||
return parsing_error(p, "No s= present");
|
||||
else if (p->pr_strict && !sdp->sdp_time)
|
||||
return parsing_error(p, "No t= present");
|
||||
|
||||
/* If there is no session level c= check that one exists for all media */
|
||||
/* c= line may be missing if this is a RTSP description */
|
||||
|
@ -1707,7 +1704,7 @@ static void parse_descs(sdp_parser_t *p,
|
|||
if (!STRICT(p))
|
||||
strip = SPACE TAB; /* skip initial whitespace */
|
||||
else
|
||||
strip = NULL;
|
||||
strip = "";
|
||||
|
||||
for (;
|
||||
record && p->pr_ok;
|
||||
|
@ -1846,7 +1843,7 @@ static char *next(char **message, const char *sep, const char *strip)
|
|||
size_t n;
|
||||
char *retval = *message;
|
||||
|
||||
if (strip)
|
||||
if (strip[0])
|
||||
retval += strspn(retval, strip);
|
||||
|
||||
n = strcspn(retval, sep);
|
||||
|
@ -1867,7 +1864,7 @@ static char *next(char **message, const char *sep, const char *strip)
|
|||
return retval;
|
||||
}
|
||||
|
||||
static void parsing_error(sdp_parser_t *p, char const *fmt, ...)
|
||||
static int parsing_error(sdp_parser_t *p, char const *fmt, ...)
|
||||
{
|
||||
int n;
|
||||
va_list ap;
|
||||
|
@ -1878,6 +1875,8 @@ static void parsing_error(sdp_parser_t *p, char const *fmt, ...)
|
|||
va_end(ap);
|
||||
|
||||
p->pr_ok = 0;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void parse_alloc_error(sdp_parser_t *p, const char *typename)
|
||||
|
|
|
@ -681,17 +681,15 @@ static void print_text_list(sdp_printer_t *p,
|
|||
static void printing_error(sdp_printer_t *p, const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
va_start(ap, fmt);
|
||||
|
||||
if (p->pr_ok) {
|
||||
int n;
|
||||
|
||||
va_start(ap, fmt);
|
||||
n = vsnprintf(p->pr_buffer, p->pr_bsiz, fmt, ap);
|
||||
|
||||
p->pr_ok = 0;
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
va_end(ap);
|
||||
p->pr_ok = 0;
|
||||
}
|
||||
|
||||
static void sdp_printf(sdp_printer_t *p, const char *fmt, ...)
|
||||
|
|
Loading…
Reference in New Issue