mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc. bug fixes in the FLAIM utilities.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@551 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-06-12 23:06:01 +00:00
parent 8ac4179f56
commit ce90e5fd12
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flaim/src/fsuperfl.cpp
View File

@@ -197,7 +197,7 @@ RCODE F_SuperFileHdl::readBlock(
IF_FileHdl * pFileHdl = NULL;
RCODE rc = NE_FLM_OK;
flmAssert( m_bSetupCalled && m_uiDbVersion);
flmAssert( m_bSetupCalled);
if( RC_BAD( rc = getFileHdl(
FSGetFileNumber( uiBlkAddress), FALSE, &pFileHdl)))
@@ -234,7 +234,7 @@ RCODE F_SuperFileHdl::writeBlock(
IF_FileHdl * pFileHdl = NULL;
RCODE rc = NE_FLM_OK;
flmAssert( m_bSetupCalled && m_uiDbVersion);
flmAssert( m_bSetupCalled);
Get_Handle:
if( RC_BAD( rc = getFileHdl(

27
flaim/util/view.cpp
View File

@@ -622,19 +622,6 @@ Get_File_Name:
gv_pSFileHdl = NULL;
}
if( RC_BAD( rc = ViewReadAndVerifyHdrInfo()))
{
if (rc == FERR_IO_PATH_NOT_FOUND)
{
goto Path_Not_Found;
}
else
{
goto Other_Error;
}
}
if ((gv_pSFileHdl = f_new F_SuperFileHdl) == NULL)
{
rc = RC_SET( FERR_MEM);
@@ -649,8 +636,20 @@ Get_File_Name:
goto Exit;
}
if( RC_BAD( rc = ViewReadAndVerifyHdrInfo()))
{
if (rc == FERR_IO_PATH_NOT_FOUND)
{
goto Path_Not_Found;
}
else
{
goto Other_Error;
}
}
gv_pSFileHdl->releaseFiles( TRUE);
if (RC_BAD( rc = FlmDbOpen( gv_szViewFileName, gv_szDataDir,
gv_szRflDir, FO_DONT_REDO_LOG,
gv_szPassword, &gv_hViewDb)))

12
flaim/util/viewedit.cpp
View File

@@ -381,8 +381,8 @@ FLMINT ViewEdit(
FLMUINT BytesToWrite;
FLMUINT BytesWritten;
FLMUINT Num;
char TempBuf[ 100];
char * BufPtr = NULL;
FLMBYTE TempBuf[ 100];
FLMBYTE * BufPtr = NULL;
RCODE rc;
FLMUINT FileOffset;
FLMUINT FileNumber;
@@ -409,7 +409,7 @@ FLMINT ViewEdit(
((gv_pViewMenuCurrItem->ModType & 0xF0) == MOD_HEX), 4,
0xFFFFFFFF))
return( FALSE);
UD2FBA( Num, TempBuf);
UD2FBA( Num, (FLMBYTE *)TempBuf);
break;
case MOD_FLMUINT16:
BytesToWrite = 2;
@@ -417,7 +417,7 @@ FLMINT ViewEdit(
((gv_pViewMenuCurrItem->ModType & 0xF0) == MOD_HEX), 2,
0xFFFF))
return( FALSE);
UW2FBA( Num, TempBuf);
UW2FBA( (FLMUINT16)Num, TempBuf);
break;
case MOD_FLMBYTE:
BytesToWrite = 1;
@@ -436,13 +436,13 @@ Mod_Binary:
FileOffset += gv_pViewMenuCurrItem->HorizCurPos;
BytesToWrite -= gv_pViewMenuCurrItem->HorizCurPos;
}
if( (!ViewEditBinary( NULL, TempBuf, &BytesToWrite, &ValEntered)) ||
if( (!ViewEditBinary( NULL, (char *)TempBuf, &BytesToWrite, &ValEntered)) ||
(!ValEntered))
return( FALSE);
break;
case MOD_TEXT:
if( (!ViewEditText( "Enter Value: ",
TempBuf, gv_pViewMenuCurrItem->ModBufLen, &ValEntered)) ||
(char *)TempBuf, gv_pViewMenuCurrItem->ModBufLen, &ValEntered)) ||
(!ValEntered))
return( FALSE);
BytesToWrite = gv_pViewMenuCurrItem->ModBufLen;