Commit 66f1e9dd authored by Jean-Paul Saman's avatar Jean-Paul Saman

Fix several memory leaks and do a bit of coding style cleanup.

parent 3143ebce
This diff is collapsed.
This diff is collapsed.
...@@ -82,7 +82,6 @@ typedef struct { ...@@ -82,7 +82,6 @@ typedef struct {
uint32_t data_offset; uint32_t data_offset;
uint16_t num_streams; uint16_t num_streams;
uint16_t flags; uint16_t flags;
} rmff_prop_t; } rmff_prop_t;
typedef struct { typedef struct {
...@@ -125,11 +124,11 @@ typedef struct { ...@@ -125,11 +124,11 @@ typedef struct {
char *copyright; char *copyright;
uint16_t comment_len; uint16_t comment_len;
char *comment; char *comment;
} rmff_cont_t; } rmff_cont_t;
typedef struct { typedef struct {
uint32_t object_id; uint32_t object_id;
uint32_t size; uint32_t size;
uint16_t object_version; uint16_t object_version;
...@@ -162,7 +161,7 @@ typedef struct { ...@@ -162,7 +161,7 @@ typedef struct {
/* /*
* constructors for header structs * constructors for header structs
*/ */
rmff_fileheader_t *rmff_new_fileheader(uint32_t num_headers); rmff_fileheader_t *rmff_new_fileheader(uint32_t num_headers);
rmff_prop_t *rmff_new_prop ( rmff_prop_t *rmff_new_prop (
......
This diff is collapsed.
...@@ -103,7 +103,7 @@ static char *rtsp_get( rtsp_client_t *rtsp ) ...@@ -103,7 +103,7 @@ static char *rtsp_get( rtsp_client_t *rtsp )
/* /*
* rtsp_put puts a line on stream * rtsp_put puts a line on stream
*/ */
static int rtsp_put( rtsp_client_t *rtsp, const char *psz_string ) static int rtsp_put( rtsp_client_t *rtsp, const char *psz_string )
{ {
int i_buffer = strlen( psz_string ); int i_buffer = strlen( psz_string );
...@@ -128,7 +128,7 @@ static int rtsp_get_status_code( rtsp_client_t *rtsp, const char *psz_string ) ...@@ -128,7 +128,7 @@ static int rtsp_get_status_code( rtsp_client_t *rtsp, const char *psz_string )
{ {
char psz_buffer[4]; char psz_buffer[4];
int i_code = 0; int i_code = 0;
if( !strncmp( psz_string, "RTSP/1.0", sizeof("RTSP/1.0") - 1 ) ) if( !strncmp( psz_string, "RTSP/1.0", sizeof("RTSP/1.0") - 1 ) )
{ {
memcpy( psz_buffer, psz_string + sizeof("RTSP/1.0"), 3 ); memcpy( psz_buffer, psz_string + sizeof("RTSP/1.0"), 3 );
...@@ -202,7 +202,7 @@ static void rtsp_schedule_standard( rtsp_client_t *rtsp ) ...@@ -202,7 +202,7 @@ static void rtsp_schedule_standard( rtsp_client_t *rtsp )
/* /*
* get the answers, if server responses with something != 200, return NULL * get the answers, if server responses with something != 200, return NULL
*/ */
static int rtsp_get_answers( rtsp_client_t *rtsp ) static int rtsp_get_answers( rtsp_client_t *rtsp )
{ {
char *answer = NULL; char *answer = NULL;
...@@ -210,7 +210,7 @@ static int rtsp_get_answers( rtsp_client_t *rtsp ) ...@@ -210,7 +210,7 @@ static int rtsp_get_answers( rtsp_client_t *rtsp )
char **answer_ptr = rtsp->p_private->answers; char **answer_ptr = rtsp->p_private->answers;
int code; int code;
int ans_count = 0; int ans_count = 0;
answer = rtsp_get( rtsp ); answer = rtsp_get( rtsp );
if( !answer ) return 0; if( !answer ) return 0;
code = rtsp_get_status_code( rtsp, answer ); code = rtsp_get_status_code( rtsp, answer );
...@@ -222,7 +222,7 @@ static int rtsp_get_answers( rtsp_client_t *rtsp ) ...@@ -222,7 +222,7 @@ static int rtsp_get_answers( rtsp_client_t *rtsp )
answer = rtsp_get( rtsp ); answer = rtsp_get( rtsp );
if( !answer ) return 0; if( !answer ) return 0;
if( !strncasecmp( answer, "Cseq:", 5 ) ) if( !strncasecmp( answer, "Cseq:", 5 ) )
{ {
sscanf( answer, "%*s %u", &answer_seq ); sscanf( answer, "%*s %u", &answer_seq );
...@@ -283,7 +283,7 @@ static int rtsp_get_answers( rtsp_client_t *rtsp ) ...@@ -283,7 +283,7 @@ static int rtsp_get_answers( rtsp_client_t *rtsp )
int rtsp_send_ok( rtsp_client_t *rtsp ) int rtsp_send_ok( rtsp_client_t *rtsp )
{ {
char cseq[16]; char cseq[16];
rtsp_put( rtsp, "RTSP/1.0 200 OK" ); rtsp_put( rtsp, "RTSP/1.0 200 OK" );
sprintf( cseq, "CSeq: %u", rtsp->p_private->cseq ); sprintf( cseq, "CSeq: %u", rtsp->p_private->cseq );
rtsp_put( rtsp, cseq ); rtsp_put( rtsp, cseq );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment