Changeset e2edb44547dfc882d42f687ba677203d0d6e0fa0

Show
Ignore:
Timestamp:
05/06/08 20:12:18 (3 months ago)
Author:
Ilkka Ollakka <ileoo@videolan.org>
git-committer:
Ilkka Ollakka <ileoo@videolan.org> 1210097538 +0300
git-parent:

[aa5fe86aed9096e92e1f4b0affbb4f6c0c6080ff]

git-author:
Ilkka Ollakka <ileoo@videolan.org> 1210097501 +0300
Message:

Adding some forgotten return-statements and removing some commented-out code.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access/rtmp/access.c

    raa5fe86 re2edb44  
    8383    int i; 
    8484 
    85     /*DOWN: 
    86     p_access->info.i_update = 0; 
    87     p_access->info.i_size = 0; 
    88     p_access->info.i_pos = 0; 
    89     p_access->info.b_eof = false; 
    90     p_access->info.i_title = 0; 
    91     p_access->info.i_seekpoint = 0; 
    92     p_access->pf_read = Read; 
    93     p_access->pf_block = Block; 
    94     p_access->pf_control = Control; 
    95     p_access->pf_seek = Seek; 
    96     do 
    97     { 
    98         p_access->p_sys = (access_sys_t *) malloc( sizeof( access_sys_t ) ); 
    99         if( !p_access->p_sys ) 
    100             return VLC_ENOMEM; 
    101     } while(0); 
    102     p_sys = p_access->p_sys; 
    103     memset( p_sys, 0, sizeof( access_sys_t ) ); 
    104     */ 
    10585    STANDARD_READ_ACCESS_INIT 
    10686 
    …… 
    388368        } 
    389369    } 
    390 /*int i; 
    391 for(i = 0; i < i_len_tmp; i += 16) 
    392 { 
    393     msg_Warn(p_access,"%.2x%.2x %.2x%.2x %.2x%.2x %.2x%.2x %.2x%.2x %.2x%.2x %.2x%.2x %.2x%.2x", 
    394 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], 
    395 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]); 
    396 }*/ 
    397370    if( i_len_tmp > 0 ) { 
    398371        if( p_sys->p_thread->result_publish ) 
    …… 
    413386                free( tmp_buffer ); 
    414387                msg_Err( p_access, "failed send publish start" ); 
     388                return -1; 
    415389            } 
    416390            free( rtmp_packet->body->body ); 
    …… 
    434408            free( tmp_buffer ); 
    435409            msg_Err( p_access, "failed send bytes read" ); 
     410            return -1; 
    436411        } 
    437412        free( rtmp_packet->body->body ); 

  • modules/access/rtmp/rtmp_amf_flv.c

    raa5fe86 re2edb44  
    229229static void rtmp_handler_null       ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet ); 
    230230static void rtmp_handler_chunk_size ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet ); 
    231 static void rtmp_handler_invoke     ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet ); 
     231static int rtmp_handler_invoke     ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet ); 
    232232static void rtmp_handler_audio_data ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet ); 
    233233static void rtmp_handler_video_data ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet ); 
    …… 
    11191119} 
    11201120 
    1121 static void 
     1121static int 
    11221122rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet ) 
    11231123{ 
    …… 
    11541154            free( tmp_buffer ); 
    11551155            msg_Err( p_thread, "failed send connection bandwith" ); 
     1156            return VLC_EGENERIC; 
    11561157        } 
    11571158        free( tmp_rtmp_packet->body->body ); 
    …… 
    11731174            free( tmp_buffer ); 
    11741175            msg_Err( p_thread, "failed send server bandwith" ); 
     1176            return VLC_EGENERIC; 
    11751177        } 
    11761178        free( tmp_rtmp_packet->body->body ); 
    …… 
    11921194            free( tmp_buffer ); 
    11931195            msg_Err( p_thread, "failed send clear stream" ); 
     1196            return VLC_EGENERIC; 
    11941197        } 
    11951198        free( tmp_rtmp_packet->body->body ); 
    …… 
    12111214            free( tmp_buffer ); 
    12121215            msg_Err( p_thread, "failed send reply NetConnection.connect" ); 
     1216            return VLC_EGENERIC; 
    12131217        } 
    12141218        free( tmp_rtmp_packet->body->body ); 
    …… 
    12351239            free( tmp_buffer ); 
    12361240            msg_Err( p_thread, "failed send reply createStream" ); 
     1241            return VLC_EGENERIC;  
    12371242        } 
    12381243        free( tmp_rtmp_packet->body->body ); 
    …… 
    12541259            free( tmp_buffer ); 
    12551260            msg_Err( p_thread, "failed send reset stream" ); 
     1261            return VLC_EGENERIC; 
    12561262        } 
    12571263        free( tmp_rtmp_packet->body->body ); 
    …… 
    12731279            free( tmp_buffer ); 
    12741280            msg_Err( p_thread, "failed send clear stream" ); 
     1281            return VLC_EGENERIC; 
    12751282        } 
    12761283        free( tmp_rtmp_packet->body->body ); 
    …… 
    13141321            free( tmp_buffer ); 
    13151322            msg_Err( p_thread, "failed send reply NetStream.play.reset" ); 
     1323            return VLC_EGENERIC; 
    13161324        } 
    13171325        free( tmp_rtmp_packet->body->body ); 
    …… 
    13331341            free( tmp_buffer ); 
    13341342            msg_Err( p_thread, "failed send reply NetStream.play.start" ); 
     1343            return VLC_EGENERIC; 
    13351344        } 
    13361345        free( tmp_rtmp_packet->body->body ); 
    …… 
    14641473    free( rtmp_packet->body ); 
    14651474    free( rtmp_packet ); 
     1475    return VLC_SUCCESS; 
    14661476} 
    14671477