[vlc-devel] commit: Adding some forgotten return-statements and removing some commented-out code . (Ilkka Ollakka )
git version control
git at videolan.org
Tue May 6 20:14:35 CEST 2008
vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Tue May 6 21:11:41 2008 +0300| [e2edb44547dfc882d42f687ba677203d0d6e0fa0]
Adding some forgotten return-statements and removing some commented-out code.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e2edb44547dfc882d42f687ba677203d0d6e0fa0
---
modules/access/rtmp/access.c | 29 ++---------------------------
modules/access/rtmp/rtmp_amf_flv.c | 14 ++++++++++++--
2 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c
index 91aade5..062aa0c 100644
--- a/modules/access/rtmp/access.c
+++ b/modules/access/rtmp/access.c
@@ -82,26 +82,6 @@ static int Open( vlc_object_t *p_this )
int length_path, length_media_name;
int i;
- /*DOWN:
- p_access->info.i_update = 0;
- p_access->info.i_size = 0;
- p_access->info.i_pos = 0;
- p_access->info.b_eof = false;
- p_access->info.i_title = 0;
- p_access->info.i_seekpoint = 0;
- p_access->pf_read = Read;
- p_access->pf_block = Block;
- p_access->pf_control = Control;
- p_access->pf_seek = Seek;
- do
- {
- p_access->p_sys = (access_sys_t *) malloc( sizeof( access_sys_t ) );
- if( !p_access->p_sys )
- return VLC_ENOMEM;
- } while(0);
- p_sys = p_access->p_sys;
- memset( p_sys, 0, sizeof( access_sys_t ) );
- */
STANDARD_READ_ACCESS_INIT
p_sys->p_thread =
@@ -387,13 +367,6 @@ static int Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
i_len_tmp += i_len - i_len_tmp;
}
}
-/*int i;
-for(i = 0; i < i_len_tmp; i += 16)
-{
- msg_Warn(p_access,"%.2x%.2x %.2x%.2x %.2x%.2x %.2x%.2x %.2x%.2x %.2x%.2x %.2x%.2x %.2x%.2x",
-p_buffer[i], p_buffer[i+1], p_buffer[i+2], p_buffer[i+3], p_buffer[i+4], p_buffer[i+5], p_buffer[i+6], p_buffer[i+7],
-p_buffer[i+8], p_buffer[i+9], p_buffer[i+10], p_buffer[i+11], p_buffer[i+12], p_buffer[i+13], p_buffer[i+14], p_buffer[i+15]);
-}*/
if( i_len_tmp > 0 ) {
if( p_sys->p_thread->result_publish )
{
@@ -412,6 +385,7 @@ p_buffer[i+8], p_buffer[i+9], p_buffer[i+10], p_buffer[i+11], p_buffer[i+12], p_
free( rtmp_packet );
free( tmp_buffer );
msg_Err( p_access, "failed send publish start" );
+ return -1;
}
free( rtmp_packet->body->body );
free( rtmp_packet->body );
@@ -433,6 +407,7 @@ p_buffer[i+8], p_buffer[i+9], p_buffer[i+10], p_buffer[i+11], p_buffer[i+12], p_
free( rtmp_packet );
free( tmp_buffer );
msg_Err( p_access, "failed send bytes read" );
+ return -1;
}
free( rtmp_packet->body->body );
free( rtmp_packet->body );
diff --git a/modules/access/rtmp/rtmp_amf_flv.c b/modules/access/rtmp/rtmp_amf_flv.c
index e0dd56d..443db66 100644
--- a/modules/access/rtmp/rtmp_amf_flv.c
+++ b/modules/access/rtmp/rtmp_amf_flv.c
@@ -228,7 +228,7 @@ const uint8_t FLV_VIDEO_FRAME_TYPE_DISPOSABLE_INTER_FRAME = 0x30;
******************************************************************************/
static void rtmp_handler_null ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
static void rtmp_handler_chunk_size ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
-static void rtmp_handler_invoke ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
+static int rtmp_handler_invoke ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
static void rtmp_handler_audio_data ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
static void rtmp_handler_video_data ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
static void rtmp_handler_notify ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
@@ -1118,7 +1118,7 @@ rtmp_handler_notify( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
free( rtmp_packet );
}
-static void
+static int
rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet )
{
rtmp_packet_t *tmp_rtmp_packet;
@@ -1153,6 +1153,7 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
free( tmp_rtmp_packet );
free( tmp_buffer );
msg_Err( p_thread, "failed send connection bandwith" );
+ return VLC_EGENERIC;
}
free( tmp_rtmp_packet->body->body );
free( tmp_rtmp_packet->body );
@@ -1172,6 +1173,7 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
free( tmp_rtmp_packet );
free( tmp_buffer );
msg_Err( p_thread, "failed send server bandwith" );
+ return VLC_EGENERIC;
}
free( tmp_rtmp_packet->body->body );
free( tmp_rtmp_packet->body );
@@ -1191,6 +1193,7 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
free( tmp_rtmp_packet );
free( tmp_buffer );
msg_Err( p_thread, "failed send clear stream" );
+ return VLC_EGENERIC;
}
free( tmp_rtmp_packet->body->body );
free( tmp_rtmp_packet->body );
@@ -1210,6 +1213,7 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
free( tmp_rtmp_packet );
free( tmp_buffer );
msg_Err( p_thread, "failed send reply NetConnection.connect" );
+ return VLC_EGENERIC;
}
free( tmp_rtmp_packet->body->body );
free( tmp_rtmp_packet->body );
@@ -1234,6 +1238,7 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
free( tmp_rtmp_packet );
free( tmp_buffer );
msg_Err( p_thread, "failed send reply createStream" );
+ return VLC_EGENERIC;
}
free( tmp_rtmp_packet->body->body );
free( tmp_rtmp_packet->body );
@@ -1253,6 +1258,7 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
free( tmp_rtmp_packet );
free( tmp_buffer );
msg_Err( p_thread, "failed send reset stream" );
+ return VLC_EGENERIC;
}
free( tmp_rtmp_packet->body->body );
free( tmp_rtmp_packet->body );
@@ -1272,6 +1278,7 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
free( tmp_rtmp_packet );
free( tmp_buffer );
msg_Err( p_thread, "failed send clear stream" );
+ return VLC_EGENERIC;
}
free( tmp_rtmp_packet->body->body );
free( tmp_rtmp_packet->body );
@@ -1313,6 +1320,7 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
free( tmp_rtmp_packet );
free( tmp_buffer );
msg_Err( p_thread, "failed send reply NetStream.play.reset" );
+ return VLC_EGENERIC;
}
free( tmp_rtmp_packet->body->body );
free( tmp_rtmp_packet->body );
@@ -1332,6 +1340,7 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
free( tmp_rtmp_packet );
free( tmp_buffer );
msg_Err( p_thread, "failed send reply NetStream.play.start" );
+ return VLC_EGENERIC;
}
free( tmp_rtmp_packet->body->body );
free( tmp_rtmp_packet->body );
@@ -1463,6 +1472,7 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
free( rtmp_packet->body->body );
free( rtmp_packet->body );
free( rtmp_packet );
+ return VLC_SUCCESS;
}
/* length header calculated automatically based on last packet in the same channel */
More information about the vlc-devel
mailing list