war on -Werror, part 4: miscellany

This commit is contained in:
Devin J. Pohly
2012-12-26 21:45:45 -05:00
parent 58aa480016
commit 1acbf07466
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -353,7 +353,7 @@ void RageLog::AddToRecentLogs( const RString &str )
const char *RageLog::GetRecentLog( int n ) const char *RageLog::GetRecentLog( int n )
{ {
if( n >= BACKLOG_LINES || n >= backlog_cnt ) if( n >= BACKLOG_LINES || n >= backlog_cnt )
return false; return NULL;
if( backlog_cnt == BACKLOG_LINES ) if( backlog_cnt == BACKLOG_LINES )
{ {
+1 -1
View File
@@ -772,7 +772,7 @@ RageSurface *RageSurfaceUtils::LoadSurface( RString file )
{ {
RageFile f; RageFile f;
if( !f.Open( file ) ) if( !f.Open( file ) )
return false; return NULL;
SurfaceHeader h; SurfaceHeader h;
if( f.Read( &h, sizeof(h) ) != sizeof(h) ) if( f.Read( &h, sizeof(h) ) != sizeof(h) )
+1 -1
View File
@@ -1545,7 +1545,7 @@ void SongManager::UpdatePreferredSort(RString sPreferredSongs, RString sPreferre
} }
else else
{ {
/* if the line ends in "/*", check if the section exists, /* if the line ends in slash-star, check if the section exists,
* and if it does, add all the songs in that group to the list. */ * and if it does, add all the songs in that group to the list. */
if( EndsWith(sLine,"/*") ) if( EndsWith(sLine,"/*") )
{ {
@@ -699,7 +699,7 @@ void MovieDecoder_FFMpeg::Close()
if( m_fctx ) if( m_fctx )
{ {
avcodec::av_close_input_file( m_fctx ); avcodec::avformat_close_input( &m_fctx );
m_fctx = NULL; m_fctx = NULL;
} }