rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

冗長な処理の削除

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1167 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yutaka 2008-04-17 01:35:39 +00:00
parent 5776995e29
commit fe3343bc33
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
build/libraries_sysmenu/dht/common/src/dht.c
View File

@ -156,18 +156,14 @@ BOOL DHT_PrepareDatabase(DHTFile* pDHT, FSFile* fp)
OS_TPrintf("Cannot read the DHT header (result=%d).\n", result); OS_TPrintf("Cannot read the DHT header (result=%d).\n", result);
return FALSE; return FALSE;
} }
// サイズチェック
PROFILE_COUNT();
length = (s32)DHT_GetDatabaseLength(pDHT);
if ( FS_GetFileLength(fp) < length ) // パディングがあり得る
{
OS_TPrintf("Invalid DHT file size (%d < %d).\n", FS_GetFileLength(fp), length);
return FALSE;
}
// ヘッダ分を削除
length -= sizeof(DHTHeader);
// データベース読み込み // データベース読み込み
PROFILE_COUNT(); PROFILE_COUNT();
length = (s32)DHT_GetDatabaseLength(pDHT) - (s32)sizeof(DHTHeader); // ƒwƒbƒ_‚ð<E2809A>œ‚­
if ( length < 0 )
{
OS_TPrintf("Invalid DHT header.\n");
return FALSE;
}
result = FS_ReadFile(fp, pDHT->database, length); result = FS_ReadFile(fp, pDHT->database, length);
if ( result != length ) if ( result != length )
{ {
@ -175,6 +171,11 @@ BOOL DHT_PrepareDatabase(DHTFile* pDHT, FSFile* fp)
return FALSE; return FALSE;
} }
} }
else
{
PROFILE_COUNT();
PROFILE_COUNT();
}
// データベースの検証 // データベースの検証
PROFILE_COUNT(); PROFILE_COUNT();
@ -184,12 +185,10 @@ BOOL DHT_PrepareDatabase(DHTFile* pDHT, FSFile* fp)
#ifdef PRINT_PROFILE #ifdef PRINT_PROFILE
PROFILE_COUNT(); PROFILE_COUNT();
OS_TPrintf("\nDone to prepare the database.\n"); OS_TPrintf("\nDone to prepare the database.\n");
OS_TPrintf("%10d msec for file open.\n", (int)OS_TicksToMilliSeconds(profile[1]-profile[0])); OS_TPrintf("%10d msec for reading header.\n", (int)OS_TicksToMilliSeconds(profile[1]-profile[0]));
OS_TPrintf("%10d msec for reading header.\n", (int)OS_TicksToMilliSeconds(profile[2]-profile[1])); OS_TPrintf("%10d msec for reading database.\n", (int)OS_TicksToMilliSeconds(profile[2]-profile[1]));
OS_TPrintf("%10d msec for size check.\n", (int)OS_TicksToMilliSeconds(profile[3]-profile[2])); OS_TPrintf("%10d msec for comparing hash.\n", (int)OS_TicksToMilliSeconds(profile[3]-profile[2]));
OS_TPrintf("%10d msec for reading database.\n", (int)OS_TicksToMilliSeconds(profile[4]-profile[3])); OS_TPrintf("\nTotal: %10d msec.\n", (int)OS_TicksToMilliSeconds(profile[3]-profile[0]));
OS_TPrintf("%10d msec for comparing hash.\n", (int)OS_TicksToMilliSeconds(profile[5]-profile[4]));
OS_TPrintf("\nTotal: %10d msec.\n", (int)OS_TicksToMilliSeconds(profile[5]-profile[0]));
#endif #endif
return result; return result;
} }