From 2d6addb969c8b600b1800ebfdb82cbc0e5c9ccd6 Mon Sep 17 00:00:00 2001 From: dsandersoremutah Date: Fri, 16 Jun 2006 16:26:08 +0000 Subject: [PATCH] Modified to use F_Pool and new FTX functions. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@579 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- flaim/util/rflread.cpp | 180 ++++++++++++------------ flaim/util/rflread.h | 16 +-- flaim/util/viewrfl.cpp | 309 +++++++++++++++++++---------------------- 3 files changed, 242 insertions(+), 263 deletions(-) diff --git a/flaim/util/rflread.cpp b/flaim/util/rflread.cpp index d159d67..ec7c732 100644 --- a/flaim/util/rflread.cpp +++ b/flaim/util/rflread.cpp @@ -97,7 +97,7 @@ FSTATIC RCODE rflGetPrevOpPacket( FLMBOOL * pbFoundPrev); FSTATIC RCODE rflPutNum( - POOL * pPool, + F_Pool * pPool, NODE * pLinkToNode, FLMBOOL bPutAsSib, eDispTag eDispTag, @@ -109,47 +109,47 @@ FSTATIC RCODE rflPutNum( FSTATIC RCODE rflExpandPacketHdr( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppParent); FSTATIC RCODE rflExpandTrnsPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest); FSTATIC RCODE rflExpandStartUnknownPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest); FSTATIC RCODE rflExpandIndexSetPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest); FSTATIC RCODE rflExpandBlkChainFreePacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest); FSTATIC RCODE rflExpandReducePacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest); FSTATIC RCODE rflExpandUpgradePacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest); FSTATIC RCODE rflExpandIndexStatePacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest); FSTATIC RCODE rflExpandDataPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, FLMBOOL bOutputPacket, FLMUINT uiPacketType, NODE ** ppDataPacketNode, @@ -157,7 +157,7 @@ FSTATIC RCODE rflExpandDataPacket( FLMUINT * puiLevel); FSTATIC RCODE rflExpandRecordPackets( - POOL * pPool, + F_Pool * pPool, FLMUINT uiOffset, FLMUINT uiPacketType, NODE ** ppLastPacketNode, @@ -165,30 +165,30 @@ FSTATIC RCODE rflExpandRecordPackets( FSTATIC RCODE rflExpandChangeFieldsPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, FLMBOOL bOutputPacket, NODE ** ppChangeFieldsPacketNode, FLMUINT * puiDataLen); FSTATIC RCODE rflExpandRecOpPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest, FLMUINT uiPacketOffset); FSTATIC RCODE rflExpandUnkPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest); FSTATIC RCODE rflExpandEncryptionPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest); FSTATIC RCODE rflExpandConfigSizePacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest); FSTATIC void rflFormatCount( @@ -775,7 +775,7 @@ FSTATIC FLMUINT rflFindNextPacket( // Read up to a full packet body. - rc = gv_pRflFileHdl->Read( uiStartOffset, + rc = gv_pRflFileHdl->read( uiStartOffset, uiBytesToRead, pucPacketHdr, &uiBytesRead); if (RC_BAD( rc)) { @@ -886,7 +886,7 @@ Get_Prev_Packet: } pucPacketHdr = pucBuffer; - rc = gv_pRflFileHdl->Read( uiReadOffset, + rc = gv_pRflFileHdl->read( uiReadOffset, uiBytesToRead, pucPacketHdr, &uiBytesRead); if (RC_BAD( rc)) { @@ -993,7 +993,7 @@ FSTATIC RCODE rflRetrievePacket( pucPacketHdr = &gv_rflBuffer [0]; uiBytesToRead = RFL_PACKET_OVERHEAD; - if (RC_BAD( rc = gv_pRflFileHdl->Read( uiFileOffset, + if (RC_BAD( rc = gv_pRflFileHdl->read( uiFileOffset, uiBytesToRead, pucPacketHdr, &uiBytesRead))) { if (rc != FERR_IO_END_OF_FILE) @@ -1226,7 +1226,7 @@ FSTATIC RCODE rflRetrievePacket( else { pucPacketBody = &gv_rflBuffer [RFL_PACKET_OVERHEAD]; - if (RC_BAD( rc = gv_pRflFileHdl->Read( uiFileOffset + RFL_PACKET_OVERHEAD, + if (RC_BAD( rc = gv_pRflFileHdl->read( uiFileOffset + RFL_PACKET_OVERHEAD, uiExpectedBodyLen, pucPacketBody, &uiBytesRead))) { if (rc != FERR_IO_END_OF_FILE) @@ -1721,14 +1721,14 @@ Desc: Retrieves the next operation in the RFL file and formats RCODE RflGetNextNode( NODE * pCurrOpNode, FLMBOOL bOperationsOnly, - POOL * pPool, + F_Pool * pPool, NODE ** ppNextNodeRV, FLMBOOL bStopAtEOF ) { RCODE rc = FERR_OK; NODE * pPacketNode = NULL; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); RFL_PACKET * pRflPacket; FLMUINT uiNextPacketAddr; FLMUINT uiPrevPacketAddr; @@ -1751,7 +1751,7 @@ RCODE RflGetNextNode( } uiPrevPacketAddr = pRflPacket->uiFileOffset; } - if (bStopAtEOF && uiNextPacketAddr > gv_uiRflEof) + if (bStopAtEOF && (FLMUINT64)uiNextPacketAddr > gv_ui64RflEof) { // pPacketNode should be NULL at this point. goto Exit; // Should return FERR_OK; @@ -1804,7 +1804,7 @@ Exit: rc = FERR_OK; } *ppNextNodeRV = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -1877,15 +1877,15 @@ Desc: Retrieves the previous operation in the RFL file and formats RCODE RflGetPrevNode( NODE * pCurrOpNode, FLMBOOL bOperationsOnly, - POOL * pPool, + F_Pool * pPool, NODE ** ppNextNodeRV ) { RCODE rc = FERR_OK; NODE * pPacketNode = NULL; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); RFL_PACKET * pRflPacket; - FLMUINT uiPrevPacketAddress; + FLMUINT64 ui64PrevPacketAddress; FLMBOOL bValidStartOffset; FLMBOOL bPositioningToEOF = FALSE; @@ -1893,11 +1893,11 @@ RCODE RflGetPrevNode( if (!pCurrOpNode) { - if (RC_BAD( rc = gv_pRflFileHdl->Size( &uiPrevPacketAddress))) + if (RC_BAD( rc = gv_pRflFileHdl->size( &ui64PrevPacketAddress))) { goto Exit; } - uiPrevPacketAddress = rflFindPrevPacket( uiPrevPacketAddress, + ui64PrevPacketAddress = (FLMUINT64)rflFindPrevPacket( (FLMUINT)ui64PrevPacketAddress, TRUE, FALSE); bPositioningToEOF = TRUE; } @@ -1907,7 +1907,7 @@ RCODE RflGetPrevNode( // If there is no previous packet pointer, read backwards to find it. - if ((uiPrevPacketAddress = pRflPacket->uiPrevPacketAddress) == 0) + if ((ui64PrevPacketAddress = (FLMUINT64)pRflPacket->uiPrevPacketAddress) == 0) { bValidStartOffset = (FLMBOOL)(((pRflPacket->uiPacketAddressBytes == 4) && (pRflPacket->uiPacketAddress == @@ -1915,12 +1915,12 @@ RCODE RflGetPrevNode( ? (FLMBOOL)TRUE : (FLMBOOL)FALSE); - uiPrevPacketAddress = rflFindPrevPacket( pRflPacket->uiFileOffset, + ui64PrevPacketAddress = (FLMUINT64)rflFindPrevPacket( pRflPacket->uiFileOffset, FALSE, bValidStartOffset); } } - if (!uiPrevPacketAddress) + if (!ui64PrevPacketAddress) { goto Exit; } @@ -1938,14 +1938,14 @@ RCODE RflGetPrevNode( rc = RC_SET( FERR_MEM); goto Exit; } - if (RC_BAD( rc = rflRetrievePacket( 0, uiPrevPacketAddress, + if (RC_BAD( rc = rflRetrievePacket( 0, (FLMUINT)ui64PrevPacketAddress, pRflPacket))) { goto Exit; } if (bPositioningToEOF) { - gv_uiRflEof = pRflPacket->uiNextPacketAddress; + gv_ui64RflEof = (FLMUINT64)pRflPacket->uiNextPacketAddress; } // If the request is for an operation, get the previous operation packet. @@ -1976,7 +1976,7 @@ Exit: rc = FERR_OK; } *ppNextNodeRV = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -1993,19 +1993,19 @@ Desc: Retrieves the node closest to the specified address. First it RCODE RflPositionToNode( FLMUINT uiFileOffset, FLMBOOL bOperationsOnly, - POOL * pPool, + F_Pool * pPool, NODE ** ppNodeRV ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pPacketNode = NULL; FLMUINT uiPacketAddr; - FLMUINT uiFileSize; + FLMUINT64 ui64FileSize; FLMBOOL bFound; RFL_PACKET * pRflPacket; - if (RC_BAD( rc = gv_pRflFileHdl->Size( &uiFileSize))) + if (RC_BAD( rc = gv_pRflFileHdl->size( &ui64FileSize))) { goto Exit; } @@ -2013,7 +2013,7 @@ RCODE RflPositionToNode( // If the specified offset is beyond the current EOF, // simply position to the last packet. - if (uiFileOffset >= uiFileSize) + if ((FLMUINT64)uiFileOffset >= ui64FileSize) { rc = RflGetPrevNode( NULL, bOperationsOnly, pPool, &pPacketNode); goto Exit; @@ -2115,7 +2115,7 @@ Exit: rc = FERR_OK; } *ppNodeRV = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -2128,7 +2128,7 @@ Exit: Desc: Puts a number in as the last child of the parent node. *********************************************************************/ FSTATIC RCODE rflPutNum( - POOL * pPool, + F_Pool * pPool, NODE * pLinkToNode, FLMBOOL bPutAsSib, eDispTag eDispTag, @@ -2213,7 +2213,7 @@ Desc: Expands a packet header into multiple GEDCOM nodes for *********************************************************************/ FSTATIC RCODE rflExpandPacketHdr( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppParent ) { @@ -2402,12 +2402,12 @@ Desc: Expands a transaction packet into multiple GEDCOM nodes *********************************************************************/ FSTATIC RCODE rflExpandTrnsPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pParent = NULL; NODE * pLastNode; FLMUINT uiOffset; @@ -2528,7 +2528,7 @@ Exit: rc = FERR_OK; } *ppForest = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -2543,12 +2543,12 @@ Desc: Expands a start unknown packet into multiple GEDCOM nodes *********************************************************************/ FSTATIC RCODE rflExpandStartUnknownPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pParent = NULL; NODE * pLastNode; FLMUINT uiOffset; @@ -2580,7 +2580,7 @@ Exit: rc = FERR_OK; } *ppForest = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -2595,12 +2595,12 @@ Desc: Expands an index set packet into multiple GEDCOM nodes *********************************************************************/ FSTATIC RCODE rflExpandIndexSetPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pParent = NULL; NODE * pLastNode; FLMUINT uiOffset; @@ -2731,7 +2731,7 @@ Exit: rc = FERR_OK; } *ppForest = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -2746,11 +2746,11 @@ Desc: Expands a block chain free packet for display of all *********************************************************************/ FSTATIC RCODE rflExpandBlkChainFreePacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pParent = NULL; NODE * pLastNode; FLMUINT uiOffset; @@ -2868,7 +2868,7 @@ Exit: rc = FERR_OK; } *ppForest = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -2883,12 +2883,12 @@ Desc: Expands a reduce packet into multiple GEDCOM nodes *********************************************************************/ FSTATIC RCODE rflExpandReducePacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pParent = NULL; NODE * pLastNode; FLMUINT uiOffset; @@ -2932,7 +2932,7 @@ Exit: rc = FERR_OK; } *ppForest = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -2947,12 +2947,12 @@ Desc: Expands an upgrade packet into multiple GEDCOM nodes *********************************************************************/ FSTATIC RCODE rflExpandUpgradePacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pParent = NULL; NODE * pLastNode; FLMUINT uiOffset; @@ -3007,7 +3007,7 @@ Exit: rc = FERR_OK; } *ppForest = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -3021,12 +3021,12 @@ Desc: Expands an index suspend or resume packet *********************************************************************/ FSTATIC RCODE rflExpandIndexStatePacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pParent = NULL; NODE * pLastNode; FLMUINT uiOffset; @@ -3070,7 +3070,7 @@ Exit: rc = FERR_OK; } *ppForest = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -3084,7 +3084,7 @@ Desc: Expand a data record packet. *********************************************************************/ FSTATIC RCODE rflExpandDataPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, FLMBOOL bOutputPacket, FLMUINT uiPacketType, NODE ** ppDataPacketNode, @@ -3093,7 +3093,7 @@ FSTATIC RCODE rflExpandDataPacket( ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pDataPacketNode = NULL; FLMBYTE * pucPacketBody; FLMUINT uiBytesRead; @@ -3141,7 +3141,7 @@ FSTATIC RCODE rflExpandDataPacket( pucPacketBody = &gv_rflBuffer [0]; f_memset( pucPacketBody, 0, pRflPacket->uiPacketBodyLength); uiOffset = pRflPacket->uiFileOffset + RFL_PACKET_OVERHEAD; - rc = gv_pRflFileHdl->Read( uiOffset, + rc = gv_pRflFileHdl->read( uiOffset, pRflPacket->uiPacketBodyLength, pucPacketBody, &uiBytesRead); @@ -3565,7 +3565,7 @@ Exit: { rc = FERR_OK; } - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -3586,14 +3586,14 @@ Desc: Expand a change fields packet. *********************************************************************/ FSTATIC RCODE rflExpandChangeFieldsPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, FLMBOOL bOutputPacket, NODE ** ppChangeFieldsPacketNode, FLMUINT * puiDataLen ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pChangeFieldsPacketNode = NULL; NODE * pChangeNode; NODE * pLastNode; @@ -3631,7 +3631,7 @@ FSTATIC RCODE rflExpandChangeFieldsPacket( pucPacketBody = &gv_rflBuffer [0]; f_memset( pucPacketBody, 0, pRflPacket->uiPacketBodyLength); uiOffset = pRflPacket->uiFileOffset + RFL_PACKET_OVERHEAD; - rc = gv_pRflFileHdl->Read( uiOffset, + rc = gv_pRflFileHdl->read( uiOffset, pRflPacket->uiPacketBodyLength, pucPacketBody, &uiBytesRead); @@ -3983,7 +3983,7 @@ Exit: { rc = FERR_OK; } - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -4005,7 +4005,7 @@ Desc: Expand the change field packets for a record modify operation into the appropriate GEDCOM nodes. *********************************************************************/ FSTATIC RCODE rflExpandRecordPackets( - POOL * pPool, + F_Pool * pPool, FLMUINT uiOffset, FLMUINT uiPacketType, NODE ** ppLastPacketNode, @@ -4117,13 +4117,13 @@ Desc: Expands a record operation packet into multiple GEDCOM nodes *********************************************************************/ FSTATIC RCODE rflExpandRecOpPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest, FLMUINT uiPacketOffset ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pParent = NULL; NODE * pLastNode; FLMUINT uiOffset; @@ -4281,7 +4281,7 @@ Exit: rc = FERR_OK; } *ppForest = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -4295,12 +4295,12 @@ Desc: Expand an unknown packet. *********************************************************************/ FSTATIC RCODE rflExpandUnkPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pForest = NULL; FLMBYTE * pucPacketBody; FLMUINT uiBytesRead; @@ -4327,7 +4327,7 @@ FSTATIC RCODE rflExpandUnkPacket( pucPacketBody = &gv_rflBuffer [0]; f_memset( pucPacketBody, 0, pRflPacket->uiPacketBodyLength); uiOffset = pRflPacket->uiFileOffset + RFL_PACKET_OVERHEAD; - rc = gv_pRflFileHdl->Read( uiOffset, + rc = gv_pRflFileHdl->read( uiOffset, pRflPacket->uiPacketBodyLength, pucPacketBody, &uiBytesRead); @@ -4368,7 +4368,7 @@ Exit: { rc = FERR_OK; } - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); *ppForest = NULL; } else @@ -4384,12 +4384,12 @@ RFL_ENABLE_ENCRYPTION_PACKET) *********************************************************************/ FSTATIC RCODE rflExpandEncryptionPacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pParent = NULL; NODE * pLastNode; NODE * pDataNode; @@ -4445,7 +4445,7 @@ FSTATIC RCODE rflExpandEncryptionPacket( } pucPacketBody = &gv_rflBuffer [0]; - rc = gv_pRflFileHdl->Read( uiOffset, + rc = gv_pRflFileHdl->read( uiOffset, pRflPacket->uiCount, pucPacketBody, NULL); @@ -4464,7 +4464,7 @@ Exit: rc = FERR_OK; } *ppForest = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -4478,12 +4478,12 @@ Desc: Expands a config rfl size packet (RFL_CONFIG_SIZE_EVENT_PACKET) *********************************************************************/ FSTATIC RCODE rflExpandConfigSizePacket( RFL_PACKET * pRflPacket, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pParent = NULL; NODE * pLastNode; FLMUINT uiOffset; @@ -4549,7 +4549,7 @@ Exit: rc = FERR_OK; } *ppForest = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { @@ -4564,12 +4564,12 @@ Desc: Expands a packet into multiple GEDCOM nodes for display of *********************************************************************/ RCODE RflExpandPacket( NODE * pPacketNode, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest ) { RCODE rc = FERR_OK; - void * pvMark = GedPoolMark( pPool); + void * pvMark = pPool->poolMark(); NODE * pForest = NULL; RFL_PACKET * pRflPacket; FLMBOOL bFoundPrev; @@ -4690,7 +4690,7 @@ Exit: rc = FERR_OK; } *ppForest = NULL; - GedPoolReset( pPool, pvMark); + pPool->poolReset( pvMark); } else { diff --git a/flaim/util/rflread.h b/flaim/util/rflread.h index 4efd973..9432bb0 100644 --- a/flaim/util/rflread.h +++ b/flaim/util/rflread.h @@ -25,8 +25,8 @@ #include "flaim.h" #include "flaimsys.h" -#ifndef RFLREAD_HPP -#define RFLREAD_HPP +#ifndef RFLREAD_H +#define RFLREAD_H extern "C" { @@ -41,9 +41,9 @@ extern "C" #define RFL_BUFFER_SIZE (65536 * 4) #endif -REXTERN F_FileHdl * gv_pRflFileHdl; +REXTERN IF_FileHdl * gv_pRflFileHdl; REXTERN FLMBYTE gv_rflBuffer [RFL_BUFFER_SIZE]; -REXTERN FLMUINT gv_uiRflEof; +REXTERN FLMUINT64 gv_ui64RflEof; // Tag numbers for internal fields. @@ -301,20 +301,20 @@ typedef struct Rfl_Packet RCODE RflPositionToNode( FLMUINT uiFileOffset, FLMBOOL bOperationsOnly, - POOL * pPool, + F_Pool * pPool, NODE ** ppNodeRV); RCODE RflGetNextNode( NODE * pCurrOpNode, FLMBOOL bOperationsOnly, - POOL * pPool, + F_Pool * pPool, NODE ** ppNextNodeRV, FLMBOOL bStopAtEOF = FALSE); RCODE RflGetPrevNode( NODE * pCurrOpNode, FLMBOOL bOperationsOnly, - POOL * pPool, + F_Pool * pPool, NODE ** ppPrevNodeRV); void RflFormatPacket( @@ -323,7 +323,7 @@ void RflFormatPacket( RCODE RflExpandPacket( NODE * pPacketNode, - POOL * pPool, + F_Pool * pPool, NODE ** ppForest); } // extern "C" diff --git a/flaim/util/viewrfl.cpp b/flaim/util/viewrfl.cpp index 839dc2e..797230d 100644 --- a/flaim/util/viewrfl.cpp +++ b/flaim/util/viewrfl.cpp @@ -22,7 +22,7 @@ // $Id: viewrfl.cpp 12329 2006-01-20 17:49:30 -0700 (Fri, 20 Jan 2006) ahodgkinson $ //------------------------------------------------------------------------- -#include "ftx.h" +#include "flaimsys.h" #include "sharutil.h" #include "flm_edit.h" #include "flmarg.h" @@ -79,7 +79,7 @@ FSTATIC RCODE rflOpenNewFile( F_RecEditor * pRecEditor, const char * pszFileName, FLMBOOL bPosAtBOF, - POOL * pTmpPool, + F_Pool * pTmpPool, NODE ** ppNd); /* @@ -102,7 +102,7 @@ RCODE viewRflMainKeyHook( RCODE viewRflMainHelpHook( F_RecEditor * pRecEditor, F_RecEditor * pHelpEditor, - POOL * pPool, + F_Pool * pPool, void * UserData, NODE ** ppRootNd); @@ -173,8 +173,7 @@ RFL_PACKET gv_SrchCriteria; FLMBOOL gv_bSrchForward; FLMBOOL gv_bDoRefresh = TRUE; FLMBOOL gv_bShutdown = FALSE; -FTX_INFO * gv_pFtxInfo = NULL; -const char * gv_pucTitle = "FLAIM RFL Viewer v1.00"; +const char * gv_pszTitle = "FLAIM RFL Viewer v1.00"; char gv_szRflPath [F_PATH_MAX_SIZE]; static F_NameTable * gv_pNameTable = NULL; #ifdef FLM_NLM @@ -252,60 +251,42 @@ void UIMain( RCODE rc = FERR_OK; gv_pRflFileHdl = NULL; - gv_uiRflEof = 0; + gv_ui64RflEof = 0; f_memset( &gv_SrchCriteria, 0, sizeof( gv_SrchCriteria)); gv_bSrchForward = TRUE; gv_SrchCriteria.uiPacketType = 0xFFFFFFFF; gv_SrchCriteria.uiMultiFileSearch = 1; - if( FTXInit( gv_pucTitle, (FLMUINT)80, (FLMUINT)50, - WPS_BLUE, WPS_WHITE, NULL, NULL, - &gv_pFtxInfo) != FTXRC_SUCCESS) + if( RC_BAD( rc = FTXInit( gv_pszTitle, (FLMUINT)80, (FLMUINT)50, + FLM_BLUE, FLM_WHITE, NULL, NULL))) { - rc = RC_SET( FERR_MEM); goto Exit; } - FTXSetShutdownFlag( gv_pFtxInfo, &gv_bShutdown); + FTXSetShutdownFlag( &gv_bShutdown); - if( FTXScreenInit( gv_pFtxInfo, gv_pucTitle, &pScreen) != FTXRC_SUCCESS) + if( RC_BAD( rc = FTXScreenInit( gv_pszTitle, &pScreen))) { - rc = RC_SET( FERR_MEM); goto Exit; } - if( FTXWinInit( pScreen, 0, 1, &pTitleWin) != FTXRC_SUCCESS) + if( RC_BAD( rc = FTXWinInit( pScreen, 0, 1, &pTitleWin))) { - rc = RC_SET( FERR_MEM); goto Exit; } - if( FTXWinPaintBackground( pTitleWin, WPS_RED) != FTXRC_SUCCESS) + FTXWinPaintBackground( pTitleWin, FLM_RED); + + FTXWinPrintStr( pTitleWin, gv_pszTitle); + + FTXWinSetCursorType( pTitleWin, FLM_CURSOR_INVISIBLE); + + if( RC_BAD( rc = FTXWinOpen( pTitleWin))) { - rc = RC_SET( FERR_MEM); goto Exit; } - if( FTXWinPrintStr( pTitleWin, gv_pucTitle) != FTXRC_SUCCESS) - { - rc = RC_SET( FERR_MEM); - goto Exit; - } - - if( FTXWinSetCursorType( pTitleWin, - WPS_CURSOR_INVISIBLE) != FTXRC_SUCCESS) - { - rc = RC_SET( FERR_MEM); - goto Exit; - } - - if( FTXWinOpen( pTitleWin) != FTXRC_SUCCESS) - { - rc = RC_SET( FERR_MEM); - goto Exit; - } - - if( (pRecEditor = new F_RecEditor) == NULL) + if( (pRecEditor = f_new F_RecEditor) == NULL) { rc = RC_SET( FERR_MEM); goto Exit; @@ -339,17 +320,17 @@ void UIMain( "Log File Name", gv_szRflPath, sizeof( gv_szRflPath), &uiTermChar); - if( uiTermChar == WPK_ESCAPE) + if( uiTermChar == FKB_ESCAPE) { goto Exit; } } - if( RC_BAD( rc = pRecEditor->getFileSystem()->Open( gv_szRflPath, - F_IO_RDWR | F_IO_SH_DENYNONE, &gv_pRflFileHdl))) + if( RC_BAD( rc = pRecEditor->getFileSystem()->openFile( gv_szRflPath, + FLM_IO_RDWR | FLM_IO_SH_DENYNONE, &gv_pRflFileHdl))) { pRecEditor->displayMessage( "Unable to open file", rc, - NULL, WPS_RED, WPS_WHITE); + NULL, FLM_RED, FLM_WHITE); rc = FERR_OK; } else @@ -382,7 +363,7 @@ Exit: gv_pRflFileHdl->Release(); } - FTXFree( &gv_pFtxInfo); + FTXExit(); } @@ -415,7 +396,7 @@ FSTATIC RCODE addLabel( return( pForm->addTextObject( uiObjectId, pszLabel, uiLen, uiLen, - 0, TRUE, WPS_BLUE, WPS_WHITE, + 0, TRUE, FLM_BLUE, FLM_WHITE, uiRow, SRCH_LABEL_COLUMN)); } @@ -440,18 +421,18 @@ FSTATIC FLMBOOL editSearchFormCB( { switch (uiKeyIn) { - case WPK_F1: - case WPK_F2: - case WPK_F3: - case WPK_F4: - case WPK_F5: - case WPK_F6: - case WPK_F7: - case WPK_F8: - case WPK_F9: - case WPK_F10: - case WPK_F11: - case WPK_F12: + case FKB_F1: + case FKB_F2: + case FKB_F3: + case FKB_F4: + case FKB_F5: + case FKB_F6: + case FKB_F7: + case FKB_F8: + case FKB_F9: + case FKB_F10: + case FKB_F11: + case FKB_F12: return( FALSE); default: return( TRUE); @@ -496,15 +477,13 @@ FSTATIC RCODE getSearchCriteria( FLMUINT uiCurrObjectId; const char * pszWhat = NULL; - if (FTXScreenGetSize( pScreen, - &uiScreenCols, &uiScreenRows) != FTXRC_SUCCESS) + if (RC_BAD( rc = FTXScreenGetSize( pScreen, &uiScreenCols, &uiScreenRows))) { pszWhat = "getting screen size"; - rc = RC_SET( FERR_MEM); goto Exit; } - if ((pForm = new FlmForm) == NULL) + if ((pForm = f_new FlmForm) == NULL) { pszWhat = "allocating form"; rc = RC_SET( FERR_MEM); @@ -513,12 +492,12 @@ FSTATIC RCODE getSearchCriteria( if (RC_BAD( rc = pForm->init( pScreen, NULL, "Search Criteria", - WPS_BLUE, WPS_WHITE, + FLM_BLUE, FLM_WHITE, "ESC=Quit, F1=search forward, other=search backward", - WPS_BLUE, WPS_WHITE, + FLM_BLUE, FLM_WHITE, 0, 0, uiScreenCols - 1, uiScreenRows - 1, TRUE, TRUE, - WPS_BLUE, WPS_LIGHTGRAY))) + FLM_BLUE, FLM_LIGHTGRAY))) { pszWhat = "initializing form"; goto Exit; @@ -534,7 +513,7 @@ FSTATIC RCODE getSearchCriteria( } if (RC_BAD( rc = pForm->addPulldownObject( SRCH_PACKET_TYPE_TAG, 20, 10, - WPS_LIGHTGRAY, WPS_RED, uiRow, SRCH_ENTER_COLUMN))) + FLM_LIGHTGRAY, FLM_RED, uiRow, SRCH_ENTER_COLUMN))) { goto Exit; } @@ -701,7 +680,7 @@ FSTATIC RCODE getSearchCriteria( if (RC_BAD( rc = pForm->addUnsignedObject( SRCH_TRANS_ID_TAG, pSrchCriteria->uiTransID, 0, 0xFFFFFFFF, 10, - 0, FALSE, WPS_LIGHTGRAY, WPS_RED, uiRow, SRCH_ENTER_COLUMN))) + 0, FALSE, FLM_LIGHTGRAY, FLM_RED, uiRow, SRCH_ENTER_COLUMN))) { goto Exit; } @@ -729,7 +708,7 @@ FSTATIC RCODE getSearchCriteria( if (RC_BAD( rc = pForm->addUnsignedObject( SRCH_CONTAINER_TAG, pSrchCriteria->uiContainer, 0, 0xFFFF, 5, - 0, FALSE, WPS_LIGHTGRAY, WPS_RED, uiRow, SRCH_ENTER_COLUMN))) + 0, FALSE, FLM_LIGHTGRAY, FLM_RED, uiRow, SRCH_ENTER_COLUMN))) { goto Exit; } @@ -757,7 +736,7 @@ FSTATIC RCODE getSearchCriteria( if (RC_BAD( rc = pForm->addUnsignedObject( SRCH_INDEX_TAG, pSrchCriteria->uiIndex, 0, 0xFFFF, 5, - 0, FALSE, WPS_LIGHTGRAY, WPS_RED, uiRow, SRCH_ENTER_COLUMN))) + 0, FALSE, FLM_LIGHTGRAY, FLM_RED, uiRow, SRCH_ENTER_COLUMN))) { goto Exit; } @@ -785,7 +764,7 @@ FSTATIC RCODE getSearchCriteria( if (RC_BAD( rc = pForm->addUnsignedObject( SRCH_DRN_TAG, pSrchCriteria->uiDrn, 0, 0xFFFFFFFF, 10, - 0, FALSE, WPS_LIGHTGRAY, WPS_RED, uiRow, SRCH_ENTER_COLUMN))) + 0, FALSE, FLM_LIGHTGRAY, FLM_RED, uiRow, SRCH_ENTER_COLUMN))) { goto Exit; } @@ -813,7 +792,7 @@ FSTATIC RCODE getSearchCriteria( if (RC_BAD( rc = pForm->addUnsignedObject( SRCH_END_DRN_TAG, pSrchCriteria->uiEndDrn, 0, 0xFFFFFFFF, 10, - 0, FALSE, WPS_LIGHTGRAY, WPS_RED, uiRow, SRCH_ENTER_COLUMN))) + 0, FALSE, FLM_LIGHTGRAY, FLM_RED, uiRow, SRCH_ENTER_COLUMN))) { goto Exit; } @@ -840,7 +819,7 @@ FSTATIC RCODE getSearchCriteria( } if (RC_BAD( rc = pForm->addPulldownObject( SRCH_MULTI_FILE_TAG, 20, 10, - WPS_LIGHTGRAY, WPS_RED, uiRow, SRCH_ENTER_COLUMN))) + FLM_LIGHTGRAY, FLM_RED, uiRow, SRCH_ENTER_COLUMN))) { goto Exit; } @@ -870,12 +849,12 @@ FSTATIC RCODE getSearchCriteria( pForm->setFormEventCB( editSearchFormCB, NULL, TRUE); uiChar = pForm->interact( &bValuesChanged, &uiCurrObjectId); - if (uiChar == WPK_ESC) + if (uiChar == FKB_ESCAPE) { rc = RC_SET( FERR_FAILURE); goto Exit; } - *pbForward = (FLMBOOL)((uiChar == WPK_F1) + *pbForward = (FLMBOOL)((uiChar == FKB_F1) ? TRUE : FALSE); @@ -886,13 +865,13 @@ FSTATIC RCODE getSearchCriteria( } Exit: - if (RC_BAD( rc) && uiChar != WPK_ESC) + if (RC_BAD( rc) && uiChar != FKB_ESCAPE) { char szErrMsg [100]; f_sprintf( (char *)szErrMsg, "Error %s", pszWhat); pRecEditor->displayMessage( szErrMsg, rc, - NULL, WPS_RED, WPS_WHITE); + NULL, FLM_RED, FLM_WHITE); } if (pForm) { @@ -1043,16 +1022,16 @@ FSTATIC RCODE viewRflHeaderDispHook( pszTmp [LABEL_WIDTH] = ' '; pszTmp [LABEL_WIDTH + 1] = 0; pDispVals[ *puiNumVals].uiCol = uiCol; - pDispVals[ *puiNumVals].uiForeground = WPS_WHITE; - pDispVals[ *puiNumVals].uiBackground = WPS_BLUE; + pDispVals[ *puiNumVals].foreground = FLM_WHITE; + pDispVals[ *puiNumVals].background = FLM_BLUE; (*puiNumVals)++; uiCol += (LABEL_WIDTH + 1); // Output the value. pDispVals[ *puiNumVals].uiCol = uiCol; - pDispVals[ *puiNumVals].uiForeground = WPS_YELLOW; - pDispVals[ *puiNumVals].uiBackground = WPS_BLUE; + pDispVals[ *puiNumVals].foreground = FLM_YELLOW; + pDispVals[ *puiNumVals].background = FLM_BLUE; (void)pRecEditor->getDisplayValue( pNd, F_RECEDIT_DEFAULT_TYPE, @@ -1078,12 +1057,12 @@ FSTATIC RCODE viewRflShowHeader( FLMUINT uiBytesRead; FLMBYTE szTmp [100]; FLMUINT uiTmp; - POOL tmpPool; + F_Pool tmpPool; RCODE rc = FERR_OK; - GedPoolInit( &tmpPool, 1024); + tmpPool.poolInit( 1024); - if( (pRecEditor = new F_RecEditor) == NULL) + if( (pRecEditor = f_new F_RecEditor) == NULL) { rc = RC_SET( FERR_MEM); goto Exit; @@ -1104,7 +1083,7 @@ FSTATIC RCODE viewRflShowHeader( // Read the header from the file. - if (RC_BAD( rc = gv_pRflFileHdl->Read( 0, 512, ucHdrBuf, &uiBytesRead))) + if (RC_BAD( rc = gv_pRflFileHdl->read( 0, 512, ucHdrBuf, &uiBytesRead))) { goto Exit; } @@ -1238,7 +1217,7 @@ Exit: pRecEditor->Release(); } - GedPoolFree( &tmpPool); + tmpPool.poolFree(); return( rc); } @@ -1249,23 +1228,23 @@ FSTATIC RCODE viewRflGetEOF( void) { RCODE rc = FERR_OK; NODE * pTmpNd; - POOL tmpPool; + F_Pool tmpPool; FLMBYTE ucHdrBuf [512]; FLMUINT uiBytesRead; FLMUINT uiEof; - GedPoolInit( &tmpPool, 4096); + tmpPool.poolInit( 4096); // First try to get the EOF from the file's header. - if (RC_BAD( rc = gv_pRflFileHdl->Read( 0, 512, ucHdrBuf, &uiBytesRead))) + if (RC_BAD( rc = gv_pRflFileHdl->read( 0, 512, ucHdrBuf, &uiBytesRead))) { goto Exit; } uiEof = (FLMUINT)FB2UD( &ucHdrBuf [RFL_EOF_POS]); if (uiEof) { - gv_uiRflEof = uiEof; + gv_ui64RflEof = (FLMUINT64)uiEof; } else { @@ -1281,16 +1260,16 @@ FSTATIC RCODE viewRflGetEOF( void) // If we still didn't get an EOF value, set it to the file size. - if (!gv_uiRflEof) + if (!gv_ui64RflEof) { - if (RC_BAD( rc = gv_pRflFileHdl->Size( &gv_uiRflEof))) + if (RC_BAD( rc = gv_pRflFileHdl->size( &gv_ui64RflEof))) { goto Exit; } } } Exit: - GedPoolFree( &tmpPool); + tmpPool.poolFree(); return( rc); } @@ -1301,12 +1280,12 @@ FSTATIC RCODE rflOpenNewFile( F_RecEditor * pRecEditor, const char * pszFileName, FLMBOOL bPosAtBOF, - POOL * pTmpPool, + F_Pool * pTmpPool, NODE ** ppNd) { RCODE rc = FERR_OK; - F_FileHdl * pFileHdl = NULL; - F_FileHdl * pSaveFileHdl = NULL; + IF_FileHdl * pFileHdl = NULL; + IF_FileHdl * pSaveFileHdl = NULL; char szPath [F_PATH_MAX_SIZE]; char szBaseName [F_FILENAME_SIZE]; char szPrefix [F_FILENAME_SIZE]; @@ -1351,8 +1330,8 @@ FSTATIC RCODE rflOpenNewFile( // See if we can open the next file. - if( RC_BAD( rc = pRecEditor->getFileSystem()->Open( pszFileName, - F_IO_RDWR | F_IO_SH_DENYNONE, &pFileHdl))) + if( RC_BAD( rc = pRecEditor->getFileSystem()->openFile( pszFileName, + FLM_IO_RDWR | FLM_IO_SH_DENYNONE, &pFileHdl))) { goto Exit; } @@ -1418,8 +1397,8 @@ RCODE viewRflMainKeyHook( NODE * pRootNd = NULL; NODE * pTmpNd = NULL; NODE * pNewNd; - POOL tmpPool; - POOL tmp2Pool; + F_Pool tmpPool; + F_Pool tmp2Pool; FTX_WINDOW * pWindow = NULL; NODE * pLastNd; NODE * pFirstNd; @@ -1432,8 +1411,8 @@ RCODE viewRflMainKeyHook( FLMUINT uiOffset; F_UNREFERENCED_PARM( UserData); - GedPoolInit( &tmpPool, 4096); - GedPoolInit( &tmp2Pool, 4096); + tmpPool.poolInit( 4096); + tmp2Pool.poolInit( 4096); if( puiKeyOut) { @@ -1443,17 +1422,17 @@ RCODE viewRflMainKeyHook( pRootNd = pRecEditor->getRootNode( pCurNd); switch( uiKeyIn) { - case WPK_DOWN: - case WPK_UP: - case WPK_PGDN: - case WPK_PGUP: + case FKB_DOWN: + case FKB_UP: + case FKB_PGDN: + case FKB_PGUP: case '?': { *puiKeyOut = uiKeyIn; break; } - case WPK_END: + case FKB_END: { FLMUINT uiLoop; @@ -1485,13 +1464,13 @@ RCODE viewRflMainKeyHook( { break; } - GedPoolReset( &tmpPool, NULL); + tmpPool.poolReset( NULL); } pRecEditor->setCurrentAtBottom(); break; } - case WPK_HOME: + case FKB_HOME: { pRecEditor->setTree( NULL); if( RC_BAD( rc = RflGetNextNode( NULL, FALSE, &tmpPool, @@ -1511,7 +1490,7 @@ RCODE viewRflMainKeyHook( View a specific entry */ - case WPK_ENTER: + case FKB_ENTER: { viewRflInspectEntry( pRecEditor); break; @@ -1528,7 +1507,7 @@ RCODE viewRflMainKeyHook( pRecEditor->requestInput( "Log File Name", szResponse, sizeof( szResponse), &uiTermChar); - if( uiTermChar == WPK_ESCAPE || !szResponse [0]) + if( uiTermChar == FKB_ESCAPE || !szResponse [0]) { break; } @@ -1537,7 +1516,7 @@ RCODE viewRflMainKeyHook( &tmpPool, &pTmpNd))) { pRecEditor->displayMessage( "Unable to open file", rc, - NULL, WPS_RED, WPS_WHITE); + NULL, FLM_RED, FLM_WHITE); } break; @@ -1547,7 +1526,7 @@ RCODE viewRflMainKeyHook( &tmpPool, &pTmpNd))) { pRecEditor->displayMessage( "Unable to open file", rc, - NULL, WPS_RED, WPS_WHITE); + NULL, FLM_RED, FLM_WHITE); } break; @@ -1557,7 +1536,7 @@ RCODE viewRflMainKeyHook( &tmpPool, &pTmpNd))) { pRecEditor->displayMessage( "Unable to open file", rc, - NULL, WPS_RED, WPS_WHITE); + NULL, FLM_RED, FLM_WHITE); } break; @@ -1574,7 +1553,7 @@ RCODE viewRflMainKeyHook( "Offset", szResponse, sizeof( szResponse), &uiTermChar); - if( uiTermChar == WPK_ESCAPE) + if( uiTermChar == FKB_ESCAPE) { break; } @@ -1588,7 +1567,7 @@ RCODE viewRflMainKeyHook( if( RC_BAD( rc = pRecEditor->getNumber( szResponse, &uiOffset, NULL))) { pRecEditor->displayMessage( "Invalid offset", rc, - NULL, WPS_RED, WPS_WHITE); + NULL, FLM_RED, FLM_WHITE); break; } @@ -1608,12 +1587,12 @@ RCODE viewRflMainKeyHook( Find something in the RFL log. */ - case WPK_F1: - case WPK_F3: + case FKB_F1: + case FKB_F3: gv_bSrchForward = TRUE; bSkipCurrent = TRUE; goto Do_Search; - case WPK_F2: + case FKB_F2: gv_bSrchForward = FALSE; bSkipCurrent = TRUE; goto Do_Search; @@ -1631,7 +1610,7 @@ RCODE viewRflMainKeyHook( Do_Search: if (RC_BAD( rc = pRecEditor->createStatusWindow( " Searching ... (press ESC to interrupt) ", - WPS_GREEN, WPS_WHITE, NULL, NULL, &pWindow))) + FLM_GREEN, FLM_WHITE, NULL, NULL, &pWindow))) { goto Exit; } @@ -1671,11 +1650,11 @@ Do_Search: // Test for the escape key - if (FTXWinTestKB( pWindow) == FTXRC_SUCCESS) + if (RC_OK( FTXWinTestKB( pWindow))) { FLMUINT uiChar; FTXWinInputChar( pWindow, &uiChar); - if( uiChar == WPK_ESCAPE) + if( uiChar == FKB_ESCAPE) { goto Exit; } @@ -1705,7 +1684,7 @@ Do_Search: // If we do not have an EOF, determine one. We don't // want to continue our search past this point. - if (!gv_uiRflEof) + if (!gv_ui64RflEof) { if (RC_BAD( rc = viewRflGetEOF())) { @@ -1715,7 +1694,7 @@ Do_Search: for (;;) { - GedPoolReset( &tmpPool, NULL); + tmpPool.poolReset( NULL); if (gv_bSrchForward) { if (RC_BAD( rc = RflGetNextNode( pLastNd, FALSE, @@ -1786,17 +1765,17 @@ Do_Search: // Test for the escape key - if (FTXWinTestKB( pWindow) == FTXRC_SUCCESS) + if (RC_OK( FTXWinTestKB( pWindow))) { FLMUINT uiChar; FTXWinInputChar( pWindow, &uiChar); - if( uiChar == WPK_ESCAPE) + if( uiChar == FKB_ESCAPE) { goto Exit; } } } - GedPoolReset( &tmp2Pool, NULL); + tmp2Pool.poolReset( NULL); if ((pLastNd = GedCopy( &tmp2Pool, 1, pCurNd)) == NULL) { rc = RC_SET( FERR_MEM); @@ -1810,10 +1789,10 @@ Do_Search: break; } - case WPK_ALT_Q: - case WPK_ESCAPE: + case FKB_ALT_Q: + case FKB_ESCAPE: { - *puiKeyOut = WPK_ESCAPE; + *puiKeyOut = FKB_ESCAPE; break; } } @@ -1823,8 +1802,8 @@ Exit: { FTXWinFree( &pWindow); } - GedPoolFree( &tmpPool); - GedPoolFree( &tmp2Pool); + tmpPool.poolFree(); + tmp2Pool.poolFree(); return( rc); } @@ -1836,7 +1815,7 @@ Desc: RCODE viewRflMainHelpHook( F_RecEditor * pRecEditor, F_RecEditor * pHelpEditor, - POOL * pPool, + F_Pool * pPool, void * UserData, NODE ** ppRootNd) { @@ -1867,42 +1846,42 @@ RCODE viewRflMainHelpHook( } if( RC_BAD( rc = gedAddField( pPool, pNewTree, - WPK_UP, (void *)"UP Move cursor up", + FKB_UP, (void *)"UP Move cursor up", 0, FLM_TEXT_TYPE))) { goto Exit; } if( RC_BAD( rc = gedAddField( pPool, pNewTree, - WPK_DOWN, (void *)"DOWN Move cursor down", + FKB_DOWN, (void *)"DOWN Move cursor down", 0, FLM_TEXT_TYPE))) { goto Exit; } if( RC_BAD( rc = gedAddField( pPool, pNewTree, - WPK_PGUP, (void *)"PG UP Page up", + FKB_PGUP, (void *)"PG UP Page up", 0, FLM_TEXT_TYPE))) { goto Exit; } if( RC_BAD( rc = gedAddField( pPool, pNewTree, - WPK_PGDN, (void *)"PG DOWN Page down", + FKB_PGDN, (void *)"PG DOWN Page down", 0, FLM_TEXT_TYPE))) { goto Exit; } if( RC_BAD( rc = gedAddField( pPool, pNewTree, - WPK_HOME, (void *)"HOME Position to beginning of file", + FKB_HOME, (void *)"HOME Position to beginning of file", 0, FLM_TEXT_TYPE))) { goto Exit; } if( RC_BAD( rc = gedAddField( pPool, pNewTree, - WPK_END, (void *)"END Position to end of file", + FKB_END, (void *)"END Position to end of file", 0, FLM_TEXT_TYPE))) { goto Exit; @@ -1937,14 +1916,14 @@ RCODE viewRflMainHelpHook( } if( RC_BAD( rc = gedAddField( pPool, pNewTree, - WPK_F1, (void *)"F1 or F3 Search forward (using last criteria entered)", + FKB_F1, (void *)"F1 or F3 Search forward (using last criteria entered)", 0, FLM_TEXT_TYPE))) { goto Exit; } if( RC_BAD( rc = gedAddField( pPool, pNewTree, - WPK_F2, (void *)"F2 Search backward (using last criteria entered)", + FKB_F2, (void *)"F2 Search backward (using last criteria entered)", 0, FLM_TEXT_TYPE))) { goto Exit; @@ -1965,7 +1944,7 @@ RCODE viewRflMainHelpHook( } if( RC_BAD( rc = gedAddField( pPool, pNewTree, - WPK_ESCAPE, (void *)"ESC, ALT-Q Exit", + FKB_ESCAPE, (void *)"ESC, ALT-Q Exit", 0, FLM_TEXT_TYPE))) { goto Exit; @@ -1989,13 +1968,13 @@ RCODE viewRflMainEventHook( void * EventData, void * UserData) { - POOL tmpPool; + F_Pool tmpPool; NODE * pTmpNd; RCODE rc = FERR_OK; F_UNREFERENCED_PARM( UserData); - GedPoolInit( &tmpPool, 4096); + tmpPool.poolInit( 4096); switch( eEventType) { @@ -2200,7 +2179,7 @@ RCODE viewRflMainEventHook( Exit: - GedPoolFree( &tmpPool); + tmpPool.poolFree(); return( rc); } @@ -2214,12 +2193,12 @@ RCODE viewRflInspectEntry( { F_RecEditor * pRecEditor; NODE * pExpandNd; - POOL tmpPool; + F_Pool tmpPool; RCODE rc = FERR_OK; - GedPoolInit( &tmpPool, 1024); + tmpPool.poolInit( 1024); - if( (pRecEditor = new F_RecEditor) == NULL) + if( (pRecEditor = f_new F_RecEditor) == NULL) { rc = RC_SET( FERR_MEM); goto Exit; @@ -2254,7 +2233,7 @@ Exit: pRecEditor->Release(); } - GedPoolFree( &tmpPool); + tmpPool.poolFree(); return( rc); } @@ -2301,8 +2280,8 @@ RCODE viewRflInspectDispHook( f_sprintf( (char *)pDispVals[ *puiNumVals].pucString, "%8.8X", (unsigned)uiOffset); pDispVals[ *puiNumVals].uiCol = uiCol; - pDispVals[ *puiNumVals].uiForeground = WPS_WHITE; - pDispVals[ *puiNumVals].uiBackground = WPS_BLUE; + pDispVals[ *puiNumVals].foreground = FLM_WHITE; + pDispVals[ *puiNumVals].background = FLM_BLUE; (*puiNumVals)++; } uiCol += 10; @@ -2314,8 +2293,8 @@ RCODE viewRflInspectDispHook( f_sprintf( (char *)pDispVals[ *puiNumVals].pucString, "%u", (unsigned)GedNodeLevel( pNd)); pDispVals[ *puiNumVals].uiCol = uiCol + (GedNodeLevel( pNd) * 2); - pDispVals[ *puiNumVals].uiForeground = WPS_WHITE; - pDispVals[ *puiNumVals].uiBackground = WPS_BLUE; + pDispVals[ *puiNumVals].foreground = FLM_WHITE; + pDispVals[ *puiNumVals].background = FLM_BLUE; uiCol += (FLMUINT)(f_strlen( pDispVals[ *puiNumVals].pucString) + (GedNodeLevel( pNd) * 2) + 1); (*puiNumVals)++; @@ -2376,17 +2355,17 @@ RCODE viewRflInspectDispHook( if( bBadField) { - pDispVals[ *puiNumVals].uiForeground = WPS_RED; - pDispVals[ *puiNumVals].uiBackground = WPS_WHITE; + pDispVals[ *puiNumVals].foreground = FLM_RED; + pDispVals[ *puiNumVals].background = FLM_WHITE; } else { #ifdef FLM_WIN - pDispVals[ *puiNumVals].uiForeground = WPS_LIGHTGREEN; + pDispVals[ *puiNumVals].foreground = FLM_LIGHTGREEN; #else - pDispVals[ *puiNumVals].uiForeground = WPS_GREEN; + pDispVals[ *puiNumVals].foreground = FLM_GREEN; #endif - pDispVals[ *puiNumVals].uiBackground = WPS_BLUE; + pDispVals[ *puiNumVals].background = FLM_BLUE; } pDispVals[ *puiNumVals].uiCol = uiCol; @@ -2419,8 +2398,8 @@ RCODE viewRflInspectDispHook( } pDispVals[ *puiNumVals].uiCol = uiCol; - pDispVals[ *puiNumVals].uiForeground = WPS_YELLOW; - pDispVals[ *puiNumVals].uiBackground = WPS_BLUE; + pDispVals[ *puiNumVals].foreground = FLM_YELLOW; + pDispVals[ *puiNumVals].background = FLM_BLUE; uiCol += (FLMUINT)(f_strlen( pDispVals[ *puiNumVals].pucString) + 1); (*puiNumVals)++; } @@ -2493,14 +2472,14 @@ RCODE viewRflInspectKeyHook( switch( uiKeyIn) { - case WPK_DOWN: - case WPK_UP: - case WPK_PGDN: - case WPK_PGUP: - case WPK_ESCAPE: - case WPK_ENTER: - case WPK_END: - case WPK_HOME: + case FKB_DOWN: + case FKB_UP: + case FKB_PGDN: + case FKB_PGUP: + case FKB_ESCAPE: + case FKB_ENTER: + case FKB_END: + case FKB_HOME: case '?': { *puiKeyOut = uiKeyIn; @@ -2564,7 +2543,7 @@ RCODE viewRflNameTableInit( } } - if( (pNameTable = new F_NameTable) == NULL) + if( (pNameTable = f_new F_NameTable) == NULL) { rc = RC_SET( FERR_MEM); goto Exit;