diff --git a/src/CryptManager.cpp b/src/CryptManager.cpp index f2b7fac2fd..1c2427b7de 100644 --- a/src/CryptManager.cpp +++ b/src/CryptManager.cpp @@ -383,9 +383,9 @@ RString CryptManager::GetMD5ForString( RString sData ) int iHash = register_hash( &md5_desc ); hash_state hash; - int iRet = hash_descriptor[iHash].init( &hash ); - iRet = hash_descriptor[iHash].process( &hash, (const unsigned char *) sData.data(), sData.size() ); - iRet = hash_descriptor[iHash].done( &hash, digest ); + hash_descriptor[iHash].init( &hash ); + hash_descriptor[iHash].process( &hash, (const unsigned char *) sData.data(), sData.size() ); + hash_descriptor[iHash].done( &hash, digest ); return RString( (const char *) digest, sizeof(digest) ); } @@ -397,9 +397,9 @@ RString CryptManager::GetSHA1ForString( RString sData ) int iHash = register_hash( &sha1_desc ); hash_state hash; - int iRet = hash_descriptor[iHash].init( &hash ); - iRet = hash_descriptor[iHash].process( &hash, (const unsigned char *) sData.data(), sData.size() ); - iRet = hash_descriptor[iHash].done( &hash, digest ); + hash_descriptor[iHash].init( &hash ); + hash_descriptor[iHash].process( &hash, (const unsigned char *) sData.data(), sData.size() ); + hash_descriptor[iHash].done( &hash, digest ); return RString( (const char *) digest, sizeof(digest) ); } diff --git a/src/FileDownload.cpp b/src/FileDownload.cpp index 80422684c2..2d397e7d8e 100644 --- a/src/FileDownload.cpp +++ b/src/FileDownload.cpp @@ -56,12 +56,7 @@ RString FileTransfer::Update( float fDeltaTime ) void FileTransfer::UpdateProgress() { - float DownloadedRatio; - - if( m_iTotalBytes < 1 ) - DownloadedRatio = 0; - else - DownloadedRatio = float(m_iDownloaded) / float(m_iTotalBytes); + // Code here did nothing... } void FileTransfer::Cancel() diff --git a/src/Player.cpp b/src/Player.cpp index 920dbcf3ae..932a5d3654 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -2110,10 +2110,7 @@ void Player::StepStrumHopo( int col, int row, const RageTimer &tm, bool bHeld, b { // TODO: remove use of PlayerNumber PlayerNumber pn = m_pPlayerState->m_PlayerNumber; - int iWeightPounds = 120; Profile *pProfile = PROFILEMAN->GetProfile( pn ); - if( pProfile ) - iWeightPounds = pProfile->GetCalculatedWeightPounds(); int iNumTracksHeld = 0; for( int t=0; ttimer_accurate) return; - /* ms of the frame we just decoded: */ - ms = mad_timer_count(mad->Timer, MAD_UNITS_MILLISECONDS); - percent = ms * 100 / mad->length; + /* the frame we just decoded: */ pos = get_this_frame_byte(mad); /* Fill in the TOC percent. */ diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index bc3ca78d76..2152266be9 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -2618,7 +2618,6 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB ) } else { - bool bAlreadyBGChangeHere = false; BackgroundLayer iLayer = BACKGROUND_LAYER_1; BackgroundChange bgChange; bgChange.m_fStartBeat = GAMESTATE->m_Position.m_fSongBeat; @@ -2626,7 +2625,6 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB ) { if( bgc->m_fStartBeat == GAMESTATE->m_Position.m_fSongBeat ) { - bAlreadyBGChangeHere = true; bgChange = *bgc; m_pSong->GetBackgroundChanges(iLayer).erase( bgc ); break; diff --git a/src/ScreenOptions.cpp b/src/ScreenOptions.cpp index ac725dd0c2..3e1e126fc6 100644 --- a/src/ScreenOptions.cpp +++ b/src/ScreenOptions.cpp @@ -650,9 +650,6 @@ void ScreenOptions::PositionRows( bool bTween ) float fPos = (float) pos; - LuaExpressionTransform *pExpr = NULL; - pExpr = &m_exprRowPositionTransformFunction; - if( i < first_start ) fPos = -0.5f; else if( i >= first_end && i < second_start ) fPos = ((int)NUM_ROWS_SHOWN)/2-0.5f; else if( i >= second_end ) fPos = ((int)NUM_ROWS_SHOWN)-0.5f; diff --git a/src/archutils/Unix/CrashHandler.cpp b/src/archutils/Unix/CrashHandler.cpp index dcbc1b411f..abbef3de25 100644 --- a/src/archutils/Unix/CrashHandler.cpp +++ b/src/archutils/Unix/CrashHandler.cpp @@ -219,7 +219,6 @@ static void RunCrashHandler( const CrashData *crash ) /* non-fatal */ } - static int received = 0; static int active = 0; if( active ) @@ -250,7 +249,6 @@ static void RunCrashHandler( const CrashData *crash ) _exit( 1 ); } active = 1; - received = getpid(); /* Stop other threads. XXX: This prints a spurious ptrace error if any threads * are already suspended, which happens in ForceCrashHandlerDeadlock(). */ diff --git a/src/libtomcrypt/src/pk/asn1/der/sequence/der_length_sequence.c b/src/libtomcrypt/src/pk/asn1/der/sequence/der_length_sequence.c index 8c50e76b5d..fea3155316 100644 --- a/src/libtomcrypt/src/pk/asn1/der/sequence/der_length_sequence.c +++ b/src/libtomcrypt/src/pk/asn1/der/sequence/der_length_sequence.c @@ -28,7 +28,7 @@ int der_length_sequence(ltc_asn1_list *list, unsigned long inlen, unsigned long *outlen) { int err, type; - unsigned long size, x, y, z, i; + unsigned long size, x, y, i; void *data; LTC_ARGCHK(list != NULL); @@ -137,7 +137,6 @@ int der_length_sequence(ltc_asn1_list *list, unsigned long inlen, } /* calc header size */ - z = y; if (y < 128) { y += 2; } else if (y < 256) {