diff --git a/flaim/src/flaim.h b/flaim/src/flaim.h index 2b79500..494222d 100644 --- a/flaim/src/flaim.h +++ b/flaim/src/flaim.h @@ -31,6 +31,29 @@ #include + // platform-specific API definitions for FLM* macros + #if defined( FLM_WIN) + #if defined( FLM_STATIC_LINK) + #define FLMEXP + #else + #if defined( FLM_SOURCE) + #define FLMEXP __declspec(dllexport) + #else + #define FLMEXP __declspec(dllimport) + #endif + #endif + #define FLMAPI __stdcall + #elif defined( FLM_NLM) + #define FLMEXP + #define FLMAPI __stdcall + #elif defined( FLM_UNIX) + #define FLMEXP + #define FLMAPI + #else + #error Platform not supported + #endif + #define FLMXPC extern "C" FLMEXP + #ifdef FLM_PACK_STRUCTS #pragma pack(push, 1) #endif @@ -1264,7 +1287,7 @@ /// Initialize a query object. /// \ingroup queryobj - FLMEXP RCODE FLMAPI FlmCursorInit( + FLMXPC RCODE FLMAPI FlmCursorInit( HFDB hDb, ///< Database handle. FLMUINT uiContainerNum, ///< Container to be searched. HFCURSOR * phCursor ///< Query handle is returned here. @@ -1272,7 +1295,7 @@ /// Free a query object. /// \ingroup queryobj - FLMEXP RCODE FLMAPI FlmCursorFree( + FLMXPC RCODE FLMAPI FlmCursorFree( HFCURSOR * phCursor ///< Pointer to query handle to be freed.\ Should be the handle returned from FlmCursorInit(). ); @@ -1281,14 +1304,14 @@ /// method is called, the query object is no longer in a state where it can be used to retrieve records from the query /// result set. /// \ingroup queryobj - FLMEXP void FLMAPI FlmCursorReleaseResources( + FLMXPC void FLMAPI FlmCursorReleaseResources( HFCURSOR hCursor ///< Handle to query object whose resources are to be released. ); /// Clone a query object. The new cloned query object should be set up with the same query criteria as the query /// object being cloned, but it should not be optimized yet. /// \ingroup queryobj - FLMEXP RCODE FLMAPI FlmCursorClone( + FLMXPC RCODE FLMAPI FlmCursorClone( HFCURSOR hSource, ///< Handle to query object that is to be cloned. HFCURSOR * phCursor ///< Newly cloned query object handle is returned here. ); @@ -1417,7 +1440,7 @@ /// Configure a query object. /// \ingroup queryconfig - FLMEXP RCODE FLMAPI FlmCursorConfig( + FLMXPC RCODE FLMAPI FlmCursorConfig( HFCURSOR hCursor, ///< Handle to query object that is to be configured. eCursorConfigType eConfigType, ///< Specifies what is to be configured in the query object. void * pvValue1, ///< Configuration parameter - depends on eConfigType - see documentation on ::eCursorConfigType. @@ -1426,7 +1449,7 @@ /// Get query configuration. /// \ingroup queryconfig - FLMEXP RCODE FLMAPI FlmCursorGetConfig( + FLMXPC RCODE FLMAPI FlmCursorGetConfig( HFCURSOR hCursor, ///< Handle to query object whose configuration information is to be retrieved. eCursorGetConfigType eGetConfigType, ///< Specifies what configuration information is to be retrieved. void * pvValue1, ///< Configuration parameter - depends on eGetConfigType - see documentation on ::eCursorGetConfigType. @@ -1435,7 +1458,7 @@ /// Set order index for a query. /// \ingroup queryconfig - FLMEXP RCODE FLMAPI FlmCursorSetOrderIndex( + FLMXPC RCODE FLMAPI FlmCursorSetOrderIndex( HFCURSOR hCursor, ///< Handle to query object whose order index is to be set. FLMUINT * puiFieldPaths, ///< List of field paths that specify the desired ordering.\ Each field path is ///< terminated with a single zero, and the entire list is terminated @@ -1446,7 +1469,7 @@ /// Set mode for string comparison operations in query criteria. /// \ingroup queryconfig - FLMEXP RCODE FLMAPI FlmCursorSetMode( + FLMXPC RCODE FLMAPI FlmCursorSetMode( HFCURSOR hCursor, ///< Handle to query object whose order index is to be set. FLMUINT uiFlags ///< Mode flags to be set for the query.\ Multiple flags may be ORed together.\ Valid ///< flags are as follows: @@ -1465,7 +1488,7 @@ /// Parse a query string to set query criteria. /// \ingroup querydef - FLMEXP RCODE FLMAPI FlmParseQuery( + FLMXPC RCODE FLMAPI FlmParseQuery( HFCURSOR hCursor, ///< Handle to query object whose criteria is to be set. F_NameTable * pNameTable, ///< Name table to use when looking up field names. const char * pszQueryCriteria ///< Query criteria. @@ -1473,7 +1496,7 @@ /// Add a field to the query criteria. /// \ingroup querydef - FLMEXP RCODE FLMAPI FlmCursorAddField( + FLMXPC RCODE FLMAPI FlmCursorAddField( HFCURSOR hCursor, ///< Handle to query object. FLMUINT uiFieldNum, ///< Field number that is to be added to query criteria. FLMUINT uiFlags ///< Flags for field.\ Flags may be any of the following ORed @@ -1501,7 +1524,7 @@ /// Add a field path to the query criteria. /// \ingroup querydef - FLMEXP RCODE FLMAPI FlmCursorAddFieldPath( + FLMXPC RCODE FLMAPI FlmCursorAddFieldPath( HFCURSOR hCursor, ///< Handle to query object. FLMUINT * puiFldPath, ///< Field path that is to be added to query criteria.\ Field path is an array of ///< zero-terminated field numbers. @@ -1510,7 +1533,7 @@ /// Add an application defined predicate to the query criteria. /// \ingroup querydef - FLMEXP RCODE FLMAPI FlmCursorAddUserPredicate( + FLMXPC RCODE FLMAPI FlmCursorAddUserPredicate( HFCURSOR hCursor, ///< Handle to query object. FlmUserPredicate * pPredicate ///< User defined predicate object. ); @@ -1557,7 +1580,7 @@ /// a field is valid. In addition, the callback function may be used to determine the field to be returned - even fetching /// it from other records or external sources. /// \ingroup querydef - FLMEXP RCODE FLMAPI FlmCursorAddFieldCB( + FLMXPC RCODE FLMAPI FlmCursorAddFieldCB( HFCURSOR hCursor, ///< Handle to query object. FLMUINT * puiFldPath, ///< Field path.\ This field path is passed into the field callback when it is called. FLMUINT uiFlags, ///< Flags for field.\ See documentation on uiFlags parameter of FlmCursorAddField(). @@ -1574,7 +1597,7 @@ /// Add a query operator to the query criteria. /// \ingroup querydef - FLMEXP RCODE FLMAPI FlmCursorAddOp( + FLMXPC RCODE FLMAPI FlmCursorAddOp( HFCURSOR hCursor, ///< Handle to query object. QTYPES eOperator, ///< Operator to be added to the query criteria. FLMBOOL bResolveUnknown = FALSE ///< Resolve comparison operators to TRUE or FALSE even if one of the operands is @@ -1583,7 +1606,7 @@ /// Add a value to the query criteria. A value is generally added where an operand would appear - such as in a comparison expression. /// \ingroup querydef - FLMEXP RCODE FLMAPI FlmCursorAddValue( + FLMXPC RCODE FLMAPI FlmCursorAddValue( HFCURSOR hCursor, ///< Handle to query object. QTYPES eValType, ///< Type of value being added to the query criteria. void * pVal, ///< Pointer to the value being added.\ This should point to a value that corresponds to the type @@ -1594,17 +1617,17 @@ /// Finalize and validate query syntax. After this function has been called, no more query criteria may be added. /// \ingroup querydef - FLMEXP RCODE FLMAPI FlmCursorValidate( + FLMXPC RCODE FLMAPI FlmCursorValidate( HFCURSOR hCursor ///< Handle to query object. ); /// Startup FLAIM database system. /// \ingroup startupshutdown - FLMEXP RCODE FLMAPI FlmStartup( void); + FLMXPC RCODE FLMAPI FlmStartup( void); /// Shutdown FLAIM database system. /// \ingroup startupshutdown - FLMEXP void FLMAPI FlmShutdown( void); + FLMXPC void FLMAPI FlmShutdown( void); /// Database system configuration options that are passed into FlmConfig() and FlmGetConfig(). typedef enum @@ -1805,7 +1828,7 @@ /// Configure the FLAIM database system. /// \ingroup systemconfiguration - FLMEXP RCODE FLMAPI FlmConfig( + FLMXPC RCODE FLMAPI FlmConfig( eFlmConfigTypes eConfigType, ///< Specified what is to be configured. void * pvValue1, ///< Parameter for configuration - see documentation for ::eFlmConfigTypes for specifics. void * pvValue2 ///< Parameter for configuration - see documentation for ::eFlmConfigTypes for specifics. @@ -1813,7 +1836,7 @@ /// Get configuration information about the FLAIM database system. /// \ingroup systemconfiguration - FLMEXP RCODE FLMAPI FlmGetConfig( + FLMXPC RCODE FLMAPI FlmGetConfig( eFlmConfigTypes eConfigType, ///< Configuration information to be retrieved. void * pvValue ///< Configuration information is returned here - see documentation for ::eFlmConfigTypes for ///< what will be returned for each configuration type. @@ -1821,7 +1844,7 @@ /// Set dynamic cache limit. /// \ingroup cacheconfiguration - FLMEXP RCODE FLMAPI FlmSetDynamicMemoryLimit( + FLMXPC RCODE FLMAPI FlmSetDynamicMemoryLimit( FLMUINT uiCacheAdjustPercent, ///< Percent of available memory to set cache limit to. FLMUINT uiCacheAdjustMin, ///< Minimum cache limit (bytes) to allow. FLMUINT uiCacheAdjustMax, ///< Maximum cache limit (bytes) to allow. @@ -1832,7 +1855,7 @@ /// Set hard cache limit. /// \ingroup cacheconfiguration - FLMEXP RCODE FLMAPI FlmSetHardMemoryLimit( + FLMXPC RCODE FLMAPI FlmSetHardMemoryLimit( FLMUINT uiPercent, ///< If non-zero, the hard limit is calculated as a percentage of either available memory ///< or total physical memory.\ If zero, the uiMax parameter is the hard limit. FLMBOOL bPercentOfAvail, ///< Only used if uiPercent is non-zero.\ If TRUE, the limit is calculated as a percentage @@ -1855,12 +1878,14 @@ /// Get cache information. /// \ingroup cacheconfiguration - FLMEXP void FLMAPI FlmGetMemoryInfo( + FLMXPC void FLMAPI FlmGetMemoryInfo( FLM_MEM_INFO * pMemInfo ///< Memory information is returned here. ); /// Get information on background threads in the FLAIM database system. /// \ingroup systemconfiguration + // JMC - FIXME: FTK provides a function of the same name - modify one of them + // so that we can export this one "C" rather than "C++" FLMEXP RCODE FLMAPI FlmGetThreadInfo( F_Pool * pPool, ///< Memory pool for allocating memory.\ This pool is used to allocate the structures ///< and other buffers that will contain the thread information.\ To free all of the @@ -1875,7 +1900,7 @@ /// Free memory that was allocated by various functions. /// \ingroup memoryalloc - FLMEXP void FLMAPI FlmFreeMem( + FLMXPC void FLMAPI FlmFreeMem( void * pMem ///< Pointer to memory to be freed. ); @@ -2019,14 +2044,14 @@ /// Get statistics. This function will allocate memory to return statistics. FlmFreeStats() should /// be called to free that memory once the application has processed the statistics. /// \ingroup stats - FLMEXP RCODE FLMAPI FlmGetStats( + FLMXPC RCODE FLMAPI FlmGetStats( FLM_STATS * pFlmStats ///< Statistics are returned here. ); /// Free statistics. This function should be called to free whatever memory was allocated /// to retrieve statistics when FlmGetStats() was called. /// \ingroup stats - FLMEXP void FLMAPI FlmFreeStats( + FLMXPC void FLMAPI FlmFreeStats( FLM_STATS * pFlmStats ///< Statistics to be freed. ); @@ -2074,7 +2099,7 @@ /// Register to catch events from the database system. /// \ingroup event - FLMEXP RCODE FLMAPI FlmRegisterForEvent( + FLMXPC RCODE FLMAPI FlmRegisterForEvent( FEventCategory eCategory, ///< Category of events to be caught. FEVENT_CB fnEventCB, ///< Function to be called when events of the specified category happen. void * pvAppData, ///< Application supplied data that is to be passed to the registered function whenever it is called. @@ -2083,7 +2108,7 @@ /// Deregister event handling function. /// \ingroup event - FLMEXP void FLMAPI FlmDeregisterForEvent( + FLMXPC void FLMAPI FlmDeregisterForEvent( HFEVENT * phEventRV ///< Event handle that was returned by FlmRegisterForEvent(). ); @@ -2334,7 +2359,7 @@ /// Create a new database. /// \ingroup dbcreateopen - FLMEXP RCODE FLMAPI FlmDbCreate( + FLMXPC RCODE FLMAPI FlmDbCreate( const char * pszDbFileName, ///< Name of database to be created.\ May be full path name or partial path name. const char * pszDataDir, ///< Name of directory where data files are to be created.\ If NULL, data files will be ///< in the same directory as the main database file - pszDbFileName. @@ -2355,7 +2380,7 @@ /// Open a database. /// \ingroup dbcreateopen - FLMEXP RCODE FLMAPI FlmDbOpen( + FLMXPC RCODE FLMAPI FlmDbOpen( const char * pszDbFileName, ///< Name of database to be opened.\ May be full path name or partial path name. const char * pszDataDir, ///< Name of directory where data files for the database are located.\ If NULL, data files are ///< assumed to be in the same directory as the main database file - pszDbFileName. @@ -2388,14 +2413,14 @@ /// Close a database. /// \ingroup dbcreateopen - FLMEXP RCODE FLMAPI FlmDbClose( + FLMXPC RCODE FLMAPI FlmDbClose( HFDB * phDb ///< Pointer to database handle that is to be closed.\ The database handle will be ///< set back to HFDB_NULL. ); /// Configure an open database. /// \ingroup dbconfig - FLMEXP RCODE FLMAPI FlmDbConfig( + FLMXPC RCODE FLMAPI FlmDbConfig( HFDB hDb, ///< Database handle of database that is to be configured. eDbConfigType eConfigType, ///< Configuration option. void * pvValue1, ///< Configuration parameter.\ Type of value here depends on the eConfigType parameter.\ See @@ -2406,7 +2431,7 @@ /// Get configuration information on an open database. /// \ingroup dbconfig - FLMEXP RCODE FLMAPI FlmDbGetConfig( + FLMXPC RCODE FLMAPI FlmDbGetConfig( HFDB hDb, ///< Database handle of database whose configuration information is to be retrieved. eDbGetConfigType eGetDbConfigType, ///< Specifies what information is to be retrieved. void * pvValue1, ///< Information is returned via this parameter.\ Type of value required depends on the @@ -2419,7 +2444,7 @@ /// Set indexing callback function. /// \ingroup dbconfig - FLMEXP void FLMAPI FlmSetIndexingCallback( + FLMXPC void FLMAPI FlmSetIndexingCallback( HFDB hDb, ///< Database handle whose indexing callback function is to be set. IX_CALLBACK fnIxCallback, ///< Indexing callback function. void * pvAppData ///< Pointer to application data that will be passed into the callback function when @@ -2428,7 +2453,7 @@ /// Get indexing callback function. /// \ingroup dbconfig - FLMEXP void FLMAPI FlmGetIndexingCallback( + FLMXPC void FLMAPI FlmGetIndexingCallback( HFDB hDb, ///< Database handle whose indexing callback function is to be retrieved. IX_CALLBACK * pfnIxCallback, ///< Callback function is returned here.\ This is the function that was ///< set using the FlmSetIndexingCallback() function. @@ -2438,7 +2463,7 @@ /// Set record validator callback function. /// \ingroup dbconfig - FLMEXP void FLMAPI FlmSetRecValidatorHook( + FLMXPC void FLMAPI FlmSetRecValidatorHook( HFDB hDb, ///< Database handle whose record validator function is to be set. REC_VALIDATOR_HOOK fnRecValidatorHook, ///< Record validator callback function.\ If this is NULL, record ///< validation is disabled. @@ -2448,7 +2473,7 @@ /// Get the record validator callback function. /// \ingroup dbconfig - FLMEXP void FLMAPI FlmGetRecValidatorHook( + FLMXPC void FLMAPI FlmGetRecValidatorHook( HFDB hDb, ///< Database handle whose record validator function is to be returned. REC_VALIDATOR_HOOK * pfnRecValidatorHook, ///< Record validator function is returned here.\ This is the function that was ///< set using the FlmSetRecValidatorHook() function. @@ -2458,7 +2483,7 @@ /// Set the general purpose status callback function. /// \ingroup dbconfig - FLMEXP void FLMAPI FlmSetStatusHook( + FLMXPC void FLMAPI FlmSetStatusHook( HFDB hDb, ///< Database handle whose general purpose status callback function is to be set. STATUS_HOOK fnStatusHook, ///< General purpose status callback function.\ If this is NULL, the general ///< purpose status callback is disabled. @@ -2468,7 +2493,7 @@ /// Get the general purpose status callback function. /// \ingroup dbconfig - FLMEXP void FLMAPI FlmGetStatusHook( + FLMXPC void FLMAPI FlmGetStatusHook( HFDB hDb, ///< Database handle whose general purpose status callback function is to be returned. STATUS_HOOK * pfnStatusHook, ///< Status callback function is returned here.\ This is the function that was ///< set using the FlmSetStatusHook() function. @@ -2478,7 +2503,7 @@ /// Retrieve status of an index. /// \ingroup indexing - FLMEXP RCODE FLMAPI FlmIndexStatus( + FLMXPC RCODE FLMAPI FlmIndexStatus( HFDB hDb, ///< Database handle - see FlmDbOpen() or FlmDbCreate(). FLMUINT uiIndexNum, ///< Index number to return status on. FINDEX_STATUS * pIndexStatus ///< Index status is returned in structure pointed to. @@ -2486,34 +2511,34 @@ /// Retrieve next index. /// \ingroup indexing - FLMEXP RCODE FLMAPI FlmIndexGetNext( + FLMXPC RCODE FLMAPI FlmIndexGetNext( HFDB hDb, ///< Database handle - see FlmDbOpen() or FlmDbCreate(). FLMUINT * puiIndexNum ///< Index number is returned here. ); /// Suspend an index. /// \ingroup indexing - FLMEXP RCODE FLMAPI FlmIndexSuspend( + FLMXPC RCODE FLMAPI FlmIndexSuspend( HFDB hDb, ///< Database handle - see FlmDbOpen() or FlmDbCreate(). FLMUINT uiIndexNum ///< Number of index to suspend. ); /// Resume an index. /// \ingroup indexing - FLMEXP RCODE FLMAPI FlmIndexResume( + FLMXPC RCODE FLMAPI FlmIndexResume( HFDB hDb, ///< Database handle - see FlmDbOpen() or FlmDbCreate(). FLMUINT uiIndexNum ///< Number of index to resume. ); /// Determine if a return code (RCODE) indicates a corruption. /// \ingroup errhandling - FLMEXP FLMBOOL FLMAPI FlmErrorIsFileCorrupt( + FLMXPC FLMBOOL FLMAPI FlmErrorIsFileCorrupt( RCODE rc ///< Error code to be tested. ); /// Convert a return code (RCODE) into a string. /// \ingroup errhandling - FLMEXP const char * FLMAPI FlmErrorString( + FLMXPC const char * FLMAPI FlmErrorString( RCODE rc ///< Error code that is to be converted to a string. ); @@ -2547,7 +2572,7 @@ /// Get diagnostic information. /// \ingroup errhandling - FLMEXP RCODE FLMAPI FlmGetDiagInfo( + FLMXPC RCODE FLMAPI FlmGetDiagInfo( HFDB hDb, ///< Database handle. eDiagInfoType eDiagCode, ///< Diagnostic desired. void * pvDiagInfo ///< Diagnostic information returned here.\ See documentation on ::eDiagInfoType for more @@ -2569,7 +2594,7 @@ /// Begin a transaction on the database. /// \ingroup trans - FLMEXP RCODE FLMAPI FlmDbTransBegin( + FLMXPC RCODE FLMAPI FlmDbTransBegin( HFDB hDb, ///< Database handle. FLMUINT uiTransType, ///< Type of transaction to start.\ May be FLM_UPDATE_TRANS or FLM_READ_TRANS.\ The ///< following flags may also be ORed into the transaction type to get special @@ -2595,7 +2620,7 @@ /// Commit current transaction (if any) on a database. /// \ingroup trans - FLMEXP RCODE FLMAPI FlmDbTransCommit( + FLMXPC RCODE FLMAPI FlmDbTransCommit( HFDB hDb, ///< Database handle. FLMBOOL * pbEmpty = NULL ///< If non-NULL, this returns a flag indicating whether or not the transaction was ///< empty.\ This is only returned for update transactions.\ If TRUE, it means @@ -2607,13 +2632,13 @@ /// Abort current transaction (if any) on a database. /// \ingroup trans - FLMEXP RCODE FLMAPI FlmDbTransAbort( + FLMXPC RCODE FLMAPI FlmDbTransAbort( HFDB hDb ///< Database handle. ); /// Get type of current transaction (if any) on a database. /// \ingroup trans - FLMEXP RCODE FLMAPI FlmDbGetTransType( + FLMXPC RCODE FLMAPI FlmDbGetTransType( HFDB hDb, ///< Database handle. FLMUINT * puiTransType ///< Transaction type is returned here.\ It will be ///< one of the following:\n @@ -2624,7 +2649,7 @@ /// Get current transaction ID. /// \ingroup trans - FLMEXP RCODE FLMAPI FlmDbGetTransId( + FLMXPC RCODE FLMAPI FlmDbGetTransId( HFDB hDb, ///< Database handle. FLMUINT * puiTransID ///< Current transaction ID is returned here.\ If no transaction is currently active, ///< the function will return RCODE::FERR_NO_TRANS_ACTIVE. @@ -2632,14 +2657,14 @@ /// Get number of committed transactions for a database. /// \ingroup trans - FLMEXP RCODE FLMAPI FlmDbGetCommitCnt( + FLMXPC RCODE FLMAPI FlmDbGetCommitCnt( HFDB hDb, ///< Database handle. FLMUINT * puiCommitCount ///< Number of transactions that have been committed is returned here. ); /// Lock a database. /// \ingroup trans - FLMEXP RCODE FLMAPI FlmDbLock( + FLMXPC RCODE FLMAPI FlmDbLock( HFDB hDb, ///< Database handle. eLockType lockType, ///< Type of lock being requested. FLMINT iPriority, ///< Priority of lock being requested. @@ -2650,13 +2675,13 @@ /// Unlock a database. /// \ingroup trans - FLMEXP RCODE FLMAPI FlmDbUnlock( + FLMXPC RCODE FLMAPI FlmDbUnlock( HFDB hDb ///< Database handle. ); /// Get the type of lock currently in effect on a database (if any). /// \ingroup trans - FLMEXP RCODE FLMAPI FlmDbGetLockType( + FLMXPC RCODE FLMAPI FlmDbGetLockType( HFDB hDb, ///< Database handle. eLockType * pLockType, ///< Type of lock currently held returned here. FLMBOOL * pbImplicit ///< Flag indicating if the lock is an implicit lock.\ An implicit lock is one that @@ -2668,7 +2693,7 @@ /// Perform a checkpoint on the database. /// \ingroup trans - FLMEXP RCODE FLMAPI FlmDbCheckpoint( + FLMXPC RCODE FLMAPI FlmDbCheckpoint( HFDB hDb, ///< Database handle. FLMUINT uiTimeout ///< Specifies the maximum number of seconds to wait to obtain the database lock.\ An ///< exclusive lock must be obtained to do a checkpoint.\ NOTE: A value of @@ -2683,7 +2708,7 @@ /// Add a record to the database. /// \ingroup update - FLMEXP RCODE FLMAPI FlmRecordAdd( + FLMXPC RCODE FLMAPI FlmRecordAdd( HFDB hDb, ///< Database handle. FLMUINT uiContainerNum, ///< Container record is to be added to. FLMUINT * puiDrn, ///< On input, *puiDrn contains the DRN to be assigned to the record.\ If *puiDrn == 0 @@ -2718,7 +2743,7 @@ /// Modify a record in the database. /// \ingroup update - FLMEXP RCODE FLMAPI FlmRecordModify( + FLMXPC RCODE FLMAPI FlmRecordModify( HFDB hDb, ///< Database handle. FLMUINT uiContainerNum, ///< Container number record is to be modified in. FLMUINT uiDrn, ///< DRN of record to be modified. @@ -2735,7 +2760,7 @@ /// Delete a record from the database. /// \ingroup update - FLMEXP RCODE FLMAPI FlmRecordDelete( + FLMXPC RCODE FLMAPI FlmRecordDelete( HFDB hDb, ///< Database handle. FLMUINT uiContainerNum, ///< Container number the record is to be deleted from. FLMUINT uiDrn, ///< DRN of record to be deleted. @@ -2748,7 +2773,7 @@ /// to the database. The DRN returned from this function may then be passed into FlmRecordAdd() to assign the DRN /// to the record being added. /// \ingroup update - FLMEXP RCODE FLMAPI FlmReserveNextDrn( + FLMXPC RCODE FLMAPI FlmReserveNextDrn( HFDB hDb, ///< Database handle. FLMUINT uiContainerNum, ///< Container number the DRN is to be reserved from. FLMUINT * puiDrn ///< The reserved DRN is returned here. @@ -2756,7 +2781,7 @@ /// Find an unused DRN in the dictionary. /// \ingroup update - FLMEXP RCODE FLMAPI FlmFindUnusedDictDrn( + FLMXPC RCODE FLMAPI FlmFindUnusedDictDrn( HFDB hDb, ///< Database handle. FLMUINT uiStartDrn, ///< Beginning of range of DRNs to look for an non-used DRN. FLMUINT uiEndDrn, ///< Ending of range of DRNs to look for a non-used DRN. @@ -2766,7 +2791,7 @@ /// Get the name of a dictionary item. /// \ingroup dbdict - FLMEXP RCODE FLMAPI FlmGetItemName( + FLMXPC RCODE FLMAPI FlmGetItemName( HFDB hDb, ///< Database handle. FLMUINT uiItemId, ///< Dictionary ID whose name is to be returned. FLMUINT uiNameBufSize, ///< Size of pszNameBuf in bytes.\ Buffer should be large enough to hold the @@ -2785,7 +2810,7 @@ /// Find and retrieve a record in a container. /// \ingroup retrieval - FLMEXP RCODE FLMAPI FlmRecordRetrieve( + FLMXPC RCODE FLMAPI FlmRecordRetrieve( HFDB hDb, ///< Database handle. FLMUINT uiContainerNum, ///< Container the record is to be retrieved from. FLMUINT uiDrn, ///< DRN of record to be retrieved.\ NOTE: The actual record retrieved depends on @@ -2808,7 +2833,7 @@ /// Find and retrieve a key in an index. /// \ingroup retrieval - FLMEXP RCODE FLMAPI FlmKeyRetrieve( + FLMXPC RCODE FLMAPI FlmKeyRetrieve( HFDB hDb, ///< Database handle. FLMUINT uiIndex, ///< Index the key is to be retrieved from. FLMUINT uiContainerNum, ///< If the index is a cross-container index, this may be used to specify a particular @@ -2853,7 +2878,7 @@ /// Begin a database backup. /// \ingroup dbbackup - FLMEXP RCODE FLMAPI FlmDbBackupBegin( + FLMXPC RCODE FLMAPI FlmDbBackupBegin( HFDB hDb, ///< Database handle. FBackupType eBackupType, ///< Type of backup being requested. FLMBOOL bHotBackup, ///< Specifies whether backup should be "hot" or "warm".\ A hot backup is one where the database is @@ -2874,7 +2899,7 @@ /// Get backup configuration on a backup that was started by FlmDbBackupBegin. /// \ingroup dbbackup - FLMEXP RCODE FLMAPI FlmBackupGetConfig( + FLMXPC RCODE FLMAPI FlmBackupGetConfig( HFBACKUP hBackup, ///< Backup handle that was returned from FlmDbBackupBegin(). eBackupGetConfigType eConfigType, ///< Type of configuration information being requested. void * pvValue1, ///< Configuration information is returned here.\ See documentation on ::eBackupGetConfigType for @@ -2894,7 +2919,7 @@ /// Perform a backup that was started by FlmDbBackupBegin. /// \ingroup dbbackup - FLMEXP RCODE FLMAPI FlmDbBackup( + FLMXPC RCODE FLMAPI FlmDbBackup( HFBACKUP hBackup, ///< Backup handle that was returned from FlmDbBackupBegin(). const char * pszBackupPath, ///< This specifieds the directory where FlmDbBackup() is to create a backup file set ///< for the backed up data.\ The files in the backup set will be named 00000001.64, @@ -2922,13 +2947,13 @@ /// been allocated during the backup. This should always be called if FlmDbBackupBegin() is successful, even if FlmDbBackup() is /// never called, or if it fails with an error code. /// \ingroup dbbackup - FLMEXP RCODE FLMAPI FlmDbBackupEnd( + FLMXPC RCODE FLMAPI FlmDbBackupEnd( HFBACKUP * phBackup /// Pointer to backup handle that is to be freed. ); /// Restore a database from a backup. /// \ingroup dbbackup - FLMEXP RCODE FLMAPI FlmDbRestore( + FLMXPC RCODE FLMAPI FlmDbRestore( const char * pszDbPath, ///< Name of database FlmDbRestore() is to create from the backup. const char * pszDataDir, ///< Directory where the restored database's data files are to be created. const char * pszBackupPath, ///< Directory where backup file set is located.\ If NULL, the backup data is @@ -2982,11 +3007,11 @@ virtual RCODE close( void) = 0; }; - FLMEXP RCODE FLMAPI FlmDbGetUnknownStreamObj( + FLMXPC RCODE FLMAPI FlmDbGetUnknownStreamObj( HFDB hDb, F_UnknownStream ** ppUnknownStream); - FLMEXP RCODE FLMAPI FlmDbGetRflFileName( + FLMXPC RCODE FLMAPI FlmDbGetRflFileName( HFDB hDb, FLMUINT uiFileNum, char * pszFileName); @@ -3199,7 +3224,7 @@ /// Allocate a BLOB object that can then be used to create a new BLOB to store in a ::FlmRecord object. /// \ingroup update - FLMEXP RCODE FLMAPI FlmAllocBlob( + FLMXPC RCODE FLMAPI FlmAllocBlob( FlmBlob ** ppBlob ///< Pointer to newly allocated BLOB object is returned here. ); @@ -3218,7 +3243,7 @@ /// Convert a FLMUINT value to FLAIM's internal storage format for numbers. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmUINT2Storage( + FLMXPC RCODE FLMAPI FlmUINT2Storage( FLMUINT uiNum, ///< Number to convert. FLMUINT * puiStorageLen, ///< On input, *puiStorageLen is the size of pucStorageBuf.\ It must be atleast F_MAX_NUM_BUF ///< bytes.\ On output *puiStorageLen is set to the number of bytes used in pucStorageBuf. @@ -3227,7 +3252,7 @@ /// Convert a FLMUINT64 value to FLAIM's internal storage format for numbers. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmUINT64ToStorage( + FLMXPC RCODE FLMAPI FlmUINT64ToStorage( FLMUINT64 ui64Num, ///< Number to convert. FLMUINT * puiStorageLen, ///< On input, *puiStorageLen is the size of pucStorageBuf.\ It must be atleast F_MAX_NUM64_BUF ///< bytes.\ On output *puiStorageLen is set to the number of bytes used in pucStorageBuf. @@ -3236,7 +3261,7 @@ /// Convert a FLMINT value to FLAIM's internal storage format for numbers. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmINT2Storage( + FLMXPC RCODE FLMAPI FlmINT2Storage( FLMINT iNum, ///< Number to convert. FLMUINT * puiStorageLen, ///< On input, *puiStorageLen is the size of pucStorageBuf.\ It must be atleast F_MAX_NUM_BUF ///< bytes.\ On output *puiStorageLen is set to the number of bytes used in pucStorageBuf. @@ -3245,7 +3270,7 @@ /// Convert a FLMINT64 value to FLAIM's internal storage format for numbers. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmINT64ToStorage( + FLMXPC RCODE FLMAPI FlmINT64ToStorage( FLMINT64 i64Num, ///< Number to convert. FLMUINT * puiStorageLen, ///< On input, *puiStorageLen is the size of pucStorageBuf.\ It must be atleast F_MAX_NUM64_BUF ///< bytes.\ On output *puiStorageLen is set to the number of bytes used in pucStorageBuf. @@ -3255,7 +3280,7 @@ /// Convert a value from FLAIM's internal format to a FLMUINT. Note that the value may be a FLM_NUMBER_TYPE, /// FLM_TEXT_TYPE, or FLM_CONTEXT_TYPE. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmStorage2UINT( + FLMXPC RCODE FLMAPI FlmStorage2UINT( FLMUINT uiValueType, ///< Data type of value being converted.\ May be FLM_NUMBER_TYPE, FLM_TEXT_TYPE, or ///< FLM_CONTEXT_TYPE. FLMUINT uiValueLength, ///< Length of value to be converted (in bytes). @@ -3266,7 +3291,7 @@ /// Convert a value from FLAIM's internal format to a FLMUINT32. Note that the value may be a FLM_NUMBER_TYPE, /// FLM_TEXT_TYPE, or FLM_CONTEXT_TYPE. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmStorage2UINT32( + FLMXPC RCODE FLMAPI FlmStorage2UINT32( FLMUINT uiValueType, ///< Data type of value being converted.\ May be FLM_NUMBER_TYPE, FLM_TEXT_TYPE, or ///< FLM_CONTEXT_TYPE. FLMUINT uiValueLength, ///< Length of value to be converted (in bytes). @@ -3277,7 +3302,7 @@ /// Convert a value from FLAIM's internal format to a FLMUINT64. Note that the value may be a FLM_NUMBER_TYPE, /// FLM_TEXT_TYPE, or FLM_CONTEXT_TYPE. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmStorage2UINT64( + FLMXPC RCODE FLMAPI FlmStorage2UINT64( FLMUINT uiValueType, ///< Data type of value being converted.\ May be FLM_NUMBER_TYPE, FLM_TEXT_TYPE, or ///< FLM_CONTEXT_TYPE. FLMUINT uiValueLength, ///< Length of value to be converted (in bytes). @@ -3288,7 +3313,7 @@ /// Convert a value from FLAIM's internal format to a FLMINT. Note that the value may be a FLM_NUMBER_TYPE, /// FLM_TEXT_TYPE, or FLM_CONTEXT_TYPE. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmStorage2INT( + FLMXPC RCODE FLMAPI FlmStorage2INT( FLMUINT uiValueType, ///< Data type of value being converted.\ May be FLM_NUMBER_TYPE, FLM_TEXT_TYPE, or ///< FLM_CONTEXT_TYPE. FLMUINT uiValueLength, ///< Length of value to be converted (in bytes). @@ -3299,7 +3324,7 @@ /// Convert a value from FLAIM's internal format to a FLMINT32. Note that the value may be a FLM_NUMBER_TYPE, /// FLM_TEXT_TYPE, or FLM_CONTEXT_TYPE. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmStorage2INT32( + FLMXPC RCODE FLMAPI FlmStorage2INT32( FLMUINT uiValueType, ///< Data type of value being converted.\ May be FLM_NUMBER_TYPE, FLM_TEXT_TYPE, or ///< FLM_CONTEXT_TYPE. FLMUINT uiValueLength, ///< Length of value to be converted (in bytes). @@ -3310,7 +3335,7 @@ /// Convert a value from FLAIM's internal format to a FLMINT64. Note that the value may be a FLM_NUMBER_TYPE, /// FLM_TEXT_TYPE, or FLM_CONTEXT_TYPE. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmStorage2INT64( + FLMXPC RCODE FLMAPI FlmStorage2INT64( FLMUINT uiValueType, ///< Data type of value being converted.\ May be FLM_NUMBER_TYPE, FLM_TEXT_TYPE, or ///< FLM_CONTEXT_TYPE. FLMUINT uiValueLength, ///< Length of value to be converted (in bytes). @@ -3320,7 +3345,7 @@ /// Convert a unicode string to FLAIM's internal storage format. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmUnicode2Storage( + FLMXPC RCODE FLMAPI FlmUnicode2Storage( const FLMUNICODE * puzStr, ///< Unicode string that is to be converted.\ FLAIM expects the string ///< to be null-terminated. FLMUINT * puiStorageLen, ///< On input, *puiStorageLen is length (in bytes) of pucStorageBuf.\ On output, *puiStorageLen @@ -3330,7 +3355,7 @@ /// Determine the number of bytes needed to store a unicode string in FLAIM's internal storage format. /// \ingroup storageconversion - FLMEXP FLMUINT FLMAPI FlmGetUnicodeStorageLength( + FLMXPC FLMUINT FLMAPI FlmGetUnicodeStorageLength( const FLMUNICODE * puzStr ///< Unicode string whose internal storage length is to be determined.\ It is ///< expected that the string will be null-terminated. ); @@ -3338,7 +3363,7 @@ /// Convert a value from FLAIM's internal format to a unicode string. Note that the value may be a FLM_NUMBER_TYPE, /// or FLM_TEXT_TYPE. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmStorage2Unicode( + FLMXPC RCODE FLMAPI FlmStorage2Unicode( FLMUINT uiValueType, ///< Data type of data being converted.\ May be FLM_NUMBER_TYPE or FLM_TEXT_TYPE. FLMUINT uiValueLength, ///< Length of value to be converted (in bytes). const FLMBYTE * pucValue, ///< Value to be converted.\ Data is expected to be in FLAIM's internal format. @@ -3370,7 +3395,7 @@ /// Convert a native string to FLAIM's internal storage format. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmNative2Storage( + FLMXPC RCODE FLMAPI FlmNative2Storage( const char * pszStr, ///< Native string that is to be converted. FLMUINT uiStrLen, ///< Length (in bytes) of the native string.\ If zero, the string is ///< expected to be NULL-terminated. @@ -3383,7 +3408,7 @@ /// Convert a value from FLAIM's internal format to a native string. Note that the value may be a FLM_NUMBER_TYPE, /// or FLM_TEXT_TYPE. /// \ingroup storageconversion - FLMEXP RCODE FLMAPI FlmStorage2Native( + FLMXPC RCODE FLMAPI FlmStorage2Native( FLMUINT uiValueType, ///< Data type of value being converted.\ May be FLM_NUMBER_TYPE or FLM_TEXT_TYPE. FLMUINT uiValueLength, ///< Length of value to be converted (in bytes). const FLMBYTE * pucValue, ///< Value to be converted.\ Data is expected to be in FLAIM's internal format. @@ -3400,7 +3425,7 @@ /// Determine the number of bytes needed to store a native string in FLAIM's internal storage format. /// \ingroup storageconversion - FLMEXP FLMUINT FLMAPI FlmGetNativeStorageLength( + FLMXPC FLMUINT FLMAPI FlmGetNativeStorageLength( const char * pszStr ///< Native string whose internal storage length is to be determined.\ It is ///< expected that the string will be null-terminated. ); @@ -3677,7 +3702,7 @@ [ 1 dseq <#>] # FLM_DICT_SEQ_TAG - dictionary sequence ID for the record */ - FLMEXP RCODE FLMAPI FlmKeyBuild( + FLMXPC RCODE FLMAPI FlmKeyBuild( HFDB hDb, FLMUINT uiIxNum, FLMUINT uiContainer, @@ -4944,7 +4969,7 @@ friend class F_Rfl; }; - FLMEXP RCODE FLMAPI flmCurPerformRead( + FLMXPC RCODE FLMAPI flmCurPerformRead( eFlmFuncs eFlmFuncId, HFCURSOR hCursor, FLMBOOL bReadForward, @@ -5043,14 +5068,14 @@ /// Retrieve current record from query result set. /// \ingroup queryret - FLMEXP RCODE FLMAPI FlmCursorCurrent( + FLMXPC RCODE FLMAPI FlmCursorCurrent( HFCURSOR hCursor, ///< Handle to query object. FlmRecord ** ppRecord ///< Pointer to found record, if any, is returned here.\ NULL is returned if no record was found. ); /// Retrieve the DRN of the current recrord in query result set. /// \ingroup queryret - FLMEXP RCODE FLMAPI FlmCursorCurrentDRN( + FLMXPC RCODE FLMAPI FlmCursorCurrentDRN( HFCURSOR hCursor, ///< Handle to query object. FLMUINT * puiDrn ///< DRN is returned here. ); @@ -5058,7 +5083,7 @@ /// Position relative to the current record (forward or backward) in the query result set /// and retrieve the record positioned to. /// \ingroup queryret - FLMEXP RCODE FLMAPI FlmCursorMoveRelative( + FLMXPC RCODE FLMAPI FlmCursorMoveRelative( HFCURSOR hCursor, ///< Handle to query object. FLMINT * piPosition, ///< On input *piPosition indicates the relative position to move within the ///< query result set.\ A negative value will move the position back @@ -5073,7 +5098,7 @@ /// records as it goes. Therefore, it may take a long time to compute, depending on the size of the result /// set and whether or not indexes can be used to optimize the query. /// \ingroup queryret - FLMEXP RCODE FLMAPI FlmCursorRecCount( + FLMXPC RCODE FLMAPI FlmCursorRecCount( HFCURSOR hCursor, ///< Handle to query object. FLMUINT * puiCount ///< Count of records in the query result set is returned here. ); @@ -5085,7 +5110,7 @@ /// -# Compares the keys to determine which is greater /// -# Optionally gets an count of the keys between the two keys (count is inclusive). /// \ingroup querycomp - FLMEXP RCODE FLMAPI FlmCursorCompareDRNs( + FLMXPC RCODE FLMAPI FlmCursorCompareDRNs( HFCURSOR hCursor, ///< Handle to query object. FLMUINT uiDRN1, ///< DRN of first record to be compared. FLMUINT uiDRN2, ///< DRN of second record to be compated. @@ -5097,7 +5122,7 @@ /// Test a record to see if it passes the query criteria. /// \ingroup querycomp - FLMEXP RCODE FLMAPI FlmCursorTestRec( + FLMXPC RCODE FLMAPI FlmCursorTestRec( HFCURSOR hCursor, ///< Handle to query object. FlmRecord * pRecord, ///< Record to be tested against the query criteria. FLMBOOL * pbIsMatch ///< Flag is returned here indicating whether or not the record matches the criteria. @@ -5105,7 +5130,7 @@ /// Retrieve and test a record (using a DRN) to see if it passes the query criteria. /// \ingroup querycomp - FLMEXP RCODE FLMAPI FlmCursorTestDRN( + FLMXPC RCODE FLMAPI FlmCursorTestDRN( HFCURSOR hCursor, ///< Handle to query object. FLMUINT uiDRN, ///< DRN of record to be tested against the query criteria.\ FLAIM will retrieve the ///< record and test it.\ The container is the container that was passed into @@ -5391,13 +5416,13 @@ } REBUILD_INFO; /// Return an error string for a corruption code. - FLMEXP const char * FLMAPI FlmVerifyErrToStr( + FLMXPC const char * FLMAPI FlmVerifyErrToStr( eCorruptionType eCorruption ///< Corruption code. ); /// Check a database for corruptions. /// \ingroup dbmaint - FLMEXP RCODE FLMAPI FlmDbCheck( + FLMXPC RCODE FLMAPI FlmDbCheck( HFDB hDb, ///< Database handle of database to be checked.\ If HFDB_NULL, FlmDbCheck will call ///< FlmDbOpen() using the pszDbFileName, pszDataDir, pszRflDir, and uiFlags parameters. const char * pszDbFileName, ///< Name of database to be checked.\ This is only used if hDb is HFDB_NULL. @@ -5431,7 +5456,7 @@ /// database may be built from it that has no corruptions. In addition, indexes in the new database /// will be rebuilt. /// \ingroup dbmaint - FLMEXP RCODE FLMAPI FlmDbRebuild( + FLMXPC RCODE FLMAPI FlmDbRebuild( const char * pszSourceDbPath, ///< Name of database to be rebuilt. const char * pszSourceDataDir, ///< Directory where database's data files are located.\ If NULL, it is assumed that the ///< database's data files are located in the same directory as pszSourceDbPath. @@ -5451,7 +5476,7 @@ /// Reduce the database size - returning unused blocks back to the file system. /// \ingroup dbmaint - FLMEXP RCODE FLMAPI FlmDbReduceSize( + FLMXPC RCODE FLMAPI FlmDbReduceSize( HFDB hDb, ///< Database handle. FLMUINT uiCount, ///< Maximum number of unused blocks to be returned to file system. FLMUINT * puiCount ///< Number of blocks actually returned.\ This should be the same as the number @@ -5460,7 +5485,7 @@ /// Traverse records in the database looking for unused fields. /// \ingroup dbmaint - FLMEXP RCODE FLMAPI FlmDbSweep( + FLMXPC RCODE FLMAPI FlmDbSweep( HFDB hDb, ///< Database handle. FLMUINT uiSweepMode, ///< Flags indicating what actions FlmDbSweep() should do while it is traversing the database.\ It ///< may be any of the following flags ORed together:\n @@ -5500,7 +5525,7 @@ /// Upgrade a database. /// \ingroup dbmaint - FLMEXP RCODE FLMAPI FlmDbUpgrade( + FLMXPC RCODE FLMAPI FlmDbUpgrade( HFDB hDb, ///< Database handle. FLMUINT uiNewVersion, ///< Version database is to be upgraded to.\ This must be greater than the current version of the database. STATUS_HOOK fnStatusCallback, ///< Callback function that is called while the database is being upgraded.\ See @@ -5531,14 +5556,14 @@ /// Get the current status of the background maintenance thread for a database. /// \ingroup dbmaint - FLMEXP RCODE FLMAPI FlmMaintenanceStatus( + FLMXPC RCODE FLMAPI FlmMaintenanceStatus( HFDB hDb, ///< Database handle. FMAINT_STATUS * pMaintStatus ///< Status is returned in this structure. ); /// Copy a database. /// \ingroup dbcopy - FLMEXP RCODE FLMAPI FlmDbCopy( + FLMXPC RCODE FLMAPI FlmDbCopy( const char * pszSrcDbName, ///< Name of database to be copied.\ May be full path name or partial path name. const char * pszSrcDataDir, ///< Name of directory where data files for the database are located.\ If NULL, data files are ///< assumed to be in the same directory as the main database file - pszSrcDbName. @@ -5559,7 +5584,7 @@ /// Rename a database. /// \ingroup dbcopy - FLMEXP RCODE FLMAPI FlmDbRename( + FLMXPC RCODE FLMAPI FlmDbRename( const char * pszDbName, ///< Name of database to be renamed.\ May be full path name or partial path name. const char * pszDataDir, ///< Name of directory where data files for the database are located.\ If NULL, data files are ///< assumed to be in the same directory as the main database file - pszDbName. @@ -5577,7 +5602,7 @@ /// Delete a database. /// \ingroup dbcopy - FLMEXP RCODE FLMAPI FlmDbRemove( + FLMXPC RCODE FLMAPI FlmDbRemove( const char * pszDbName, ///< Name of database to be deleted.\ May be full path name or partial path name. const char * pszDataDir, ///< Name of directory where data files for the database are located.\ If NULL, data files are ///< assumed to be in the same directory as the main database file - pszDbName. @@ -5588,7 +5613,7 @@ /// Enable encryption for a database. /// \ingroup encryption - FLMEXP RCODE FLMAPI FlmEnableEncryption( + FLMXPC RCODE FLMAPI FlmEnableEncryption( HFDB hDb, ///< Database handle. FLMBYTE ** ppucWrappingKey, ///< This returns a pointer to a buffer containing the database key wrapped in the ///< NICI local storage key.\ FlmEnableEncryption() allocates memory for this buffer.\ The @@ -5598,7 +5623,7 @@ /// Wrap a database's encryption key in a password. /// \ingroup encryption - FLMEXP RCODE FLMAPI FlmDbWrapKey( + FLMXPC RCODE FLMAPI FlmDbWrapKey( HFDB hDb, ///< Database handle. const char * pszPassword ///< Password to wrap the database key in.\ May be NULL to wrap the key in the NICI ///< local storage key.\ NOTE: Once the database key has been wrapped in a password, diff --git a/flaim/src/fsysdata.cpp b/flaim/src/fsysdata.cpp index a01d338..ad77d60 100644 --- a/flaim/src/fsysdata.cpp +++ b/flaim/src/fsysdata.cpp @@ -1731,7 +1731,7 @@ FLMEXP RCODE FLMAPI FlmGetConfig( /**************************************************************************** Desc: ****************************************************************************/ -FLMEXP RCODE FLMAPI FlmGetThreadInfo( +RCODE FLMAPI FlmGetThreadInfo( F_Pool * pPool, F_THREAD_INFO ** ppThreadInfo, FLMUINT * puiNumThreads, diff --git a/flaim/win32/flaim/flaim/flaim.vcproj b/flaim/win32/flaim/flaim/flaim.vcproj index a77efdb..d6668f3 100644 --- a/flaim/win32/flaim/flaim/flaim.vcproj +++ b/flaim/win32/flaim/flaim/flaim.vcproj @@ -65,8 +65,9 @@ /> uiFreeOffset : NULL); } - FINLINE FLMUINT FLMAPI getBlockSize( void) + FINLINE FLMUINT FTKAPI getBlockSize( void) { return( m_uiBlockSize); } - FINLINE FLMUINT FLMAPI getBytesAllocated( void) + FINLINE FLMUINT FTKAPI getBytesAllocated( void) { return( m_uiBytesAllocated); } @@ -5012,7 +5006,7 @@ } } - FINLINE void FLMAPI truncateData( + FINLINE void FTKAPI truncateData( FLMUINT uiSize) { if( uiSize < m_uiOffset) @@ -5021,7 +5015,7 @@ } } - FINLINE RCODE FLMAPI allocSpace( + FINLINE RCODE FTKAPI allocSpace( FLMUINT uiSize, void ** ppvPtr) { @@ -5043,7 +5037,7 @@ return( rc); } - FINLINE RCODE FLMAPI appendByte( + FINLINE RCODE FTKAPI appendByte( FLMBYTE ucChar) { RCODE rc = NE_FLM_OK; @@ -5061,7 +5055,7 @@ return( rc); } - FINLINE RCODE FLMAPI appendUniChar( + FINLINE RCODE FTKAPI appendUniChar( FLMUNICODE uChar) { RCODE rc = NE_FLM_OK; @@ -5079,7 +5073,7 @@ return( rc); } - FINLINE RCODE FLMAPI appendData( + FINLINE RCODE FTKAPI appendData( const void * pvData, FLMUINT uiSize) { @@ -5105,7 +5099,7 @@ return( rc); } - FINLINE RCODE FLMAPI appendString( + FINLINE RCODE FTKAPI appendString( const char * pszString) { RCODE rc = NE_FLM_OK; @@ -5124,12 +5118,12 @@ return( rc); } - FINLINE FLMBYTE * FLMAPI getBufferPtr( void) + FINLINE FLMBYTE * FTKAPI getBufferPtr( void) { return( m_pucBuffer); } - FINLINE FLMUNICODE * FLMAPI getUnicodePtr( void) + FINLINE FLMUNICODE * FTKAPI getUnicodePtr( void) { if( m_uiOffset >= sizeof( FLMUNICODE)) { @@ -5139,7 +5133,7 @@ return( NULL); } - FINLINE FLMUINT FLMAPI getUnicodeLength( void) + FINLINE FLMUINT FTKAPI getUnicodeLength( void) { if( m_uiOffset <= sizeof( FLMUNICODE)) { @@ -5149,12 +5143,12 @@ return( (m_uiOffset >> 1) - 1); } - FINLINE FLMUINT FLMAPI getDataLength( void) + FINLINE FLMUINT FTKAPI getDataLength( void) { return( m_uiOffset); } - FINLINE RCODE FLMAPI copyFromBuffer( + FINLINE RCODE FTKAPI copyFromBuffer( F_DynaBuf * pSource) { RCODE rc = NE_FLM_OK; @@ -5248,11 +5242,11 @@ } } - RCODE FLMAPI setElementAt( + RCODE FTKAPI setElementAt( void * pData, FLMUINT uiIndex); - void * FLMAPI getElementAt( + void * FTKAPI getElementAt( FLMUINT uiIndex); private: @@ -5294,7 +5288,7 @@ } } - FINLINE void FLMAPI clear( void) + FINLINE void FTKAPI clear( void) { if( m_pszVal) { @@ -5305,31 +5299,31 @@ m_uiValStrLen = 0; } - FINLINE FLMUINT FLMAPI getLength( void) + FINLINE FLMUINT FTKAPI getLength( void) { return( m_uiValStrLen); } - RCODE FLMAPI printf( + RCODE FTKAPI printf( const char * pszFormatString, ...); - RCODE FLMAPI appendCHAR( + RCODE FTKAPI appendCHAR( char ucChar, FLMUINT uiHowMany = 1); - RCODE FLMAPI appendTEXT( + RCODE FTKAPI appendTEXT( const FLMBYTE * pszVal); - RCODE FLMAPI appendTEXT( + RCODE FTKAPI appendTEXT( const char * pszVal) { return( appendTEXT( (FLMBYTE*)pszVal)); } - RCODE FLMAPI appendf( + RCODE FTKAPI appendf( const char * pszFormatString, ...); - FINLINE const char * FLMAPI getTEXT( void) + FINLINE const char * FTKAPI getTEXT( void) { if( m_bQuickBufActive) { @@ -5529,7 +5523,7 @@ /// IF_LockInfoClient::addLockInfo() method. The application should /// return TRUE from this method in order to continue, FALSE if it wants /// to stop and return from the IF_LockObject::getLockInfo() function. - virtual FLMBOOL FLMAPI setLockCount( + virtual FLMBOOL FTKAPI setLockCount( FLMUINT uiTotalLocks ///< Total number of lock holders plus lock waiters. ) = 0; @@ -5538,7 +5532,7 @@ /// to obtain the lock. The application should return TRUE from this /// method in order to continue, FALSE if it wants to stop and return /// from the IF_LockObject::getLockInfo() function. - virtual FLMBOOL FLMAPI addLockInfo( + virtual FLMBOOL FTKAPI addLockInfo( FLMUINT uiLockNum, ///< Position in queue (0 = lock holder, 1..n = lock waiter). FLMUINT uiThreadID, ///< Thread ID of the lock holder/waiter. FLMUINT uiTime ///< For the lock holder, this is the amount of time the lock has been @@ -5586,21 +5580,21 @@ ****************************************************************************/ flminterface IF_LockObject : public F_Object { - virtual RCODE FLMAPI lock( + virtual RCODE FTKAPI lock( F_SEM hWaitSem, FLMBOOL bExclLock, FLMUINT uiMaxWaitSecs, FLMINT iPriority, F_LOCK_STATS * pLockStats = NULL) = 0; - virtual RCODE FLMAPI unlock( + virtual RCODE FTKAPI unlock( F_LOCK_STATS * pLockStats = NULL) = 0; - virtual FLMUINT FLMAPI getLockCount( void) = 0; + virtual FLMUINT FTKAPI getLockCount( void) = 0; - virtual FLMUINT FLMAPI getWaiterCount( void) = 0; + virtual FLMUINT FTKAPI getWaiterCount( void) = 0; - virtual RCODE FLMAPI getLockInfo( + virtual RCODE FTKAPI getLockInfo( FLMINT iPriority, eLockType * peCurrLockType, FLMUINT * puiThreadId, @@ -5609,22 +5603,22 @@ FLMUINT * puiNumSharedQueued = NULL, FLMUINT * puiPriorityCount = NULL) = 0; - virtual RCODE FLMAPI getLockInfo( + virtual RCODE FTKAPI getLockInfo( IF_LockInfoClient * pLockInfo) = 0; - virtual RCODE FLMAPI getLockQueue( + virtual RCODE FTKAPI getLockQueue( F_LOCK_USER ** ppLockUsers) = 0; - virtual FLMBOOL FLMAPI haveHigherPriorityWaiter( + virtual FLMBOOL FTKAPI haveHigherPriorityWaiter( FLMINT iPriority) = 0; - virtual void FLMAPI timeoutLockWaiter( + virtual void FTKAPI timeoutLockWaiter( FLMUINT uiThreadId) = 0; - virtual void FLMAPI timeoutAllWaiters( void) = 0; + virtual void FTKAPI timeoutAllWaiters( void) = 0; }; - FTKEXPC RCODE FLMAPI FlmAllocLockObject( + FTKXPC RCODE FTKAPI FlmAllocLockObject( IF_LockObject ** ppLockObject); /**************************************************************************** @@ -5751,20 +5745,20 @@ : FALSE); } - FTKEXPC FLMBOOL FLMAPI f_isNumber( + FTKXPC FLMBOOL FTKAPI f_isNumber( const char * pszStr, FLMBOOL * pbNegative = NULL, FLMBOOL * pbHex = NULL); - FTKEXPC RCODE FLMAPI f_filecpy( + FTKXPC RCODE FTKAPI f_filecpy( const char * pszSourceFile, const char * pszData); - FTKEXPC RCODE FLMAPI f_filecat( + FTKXPC RCODE FTKAPI f_filecat( const char * pszSourceFile, const char * pszData); - FTKEXPC RCODE FLMAPI f_filetobuf( + FTKXPC RCODE FTKAPI f_filetobuf( const char * pszSourceFile, char ** ppszBuffer); @@ -5950,12 +5944,12 @@ typedef struct FTX_WINDOW FTX_WINDOW; - typedef FLMBOOL (FLMAPI * KEY_HANDLER)( + typedef FLMBOOL (FTKAPI * KEY_HANDLER)( FLMUINT uiKeyIn, FLMUINT * puiKeyOut, void * pvAppData); - FTKEXPC RCODE FLMAPI FTXInit( + FTKXPC RCODE FTKAPI FTXInit( const char * pszAppName = NULL, FLMUINT uiCols = 0, FLMUINT uiRows = 0, @@ -5964,159 +5958,159 @@ KEY_HANDLER pKeyHandler = NULL, void * pvKeyHandlerData = NULL); - FTKEXPC void FLMAPI FTXExit( void); + FTKXPC void FTKAPI FTXExit( void); - FTKEXPC void FLMAPI FTXCycleScreensNext( void); + FTKXPC void FTKAPI FTXCycleScreensNext( void); - FTKEXPC void FLMAPI FTXCycleScreensPrev( void); + FTKXPC void FTKAPI FTXCycleScreensPrev( void); - FTKEXPC void FLMAPI FTXRefreshCursor( void); + FTKXPC void FTKAPI FTXRefreshCursor( void); - FTKEXPC void FLMAPI FTXInvalidate( void); + FTKXPC void FTKAPI FTXInvalidate( void); - FTKEXPC void FLMAPI FTXSetShutdownFlag( + FTKXPC void FTKAPI FTXSetShutdownFlag( FLMBOOL * pbShutdownFlag); - FTKEXPC RCODE FLMAPI FTXScreenInit( + FTKXPC RCODE FTKAPI FTXScreenInit( const char * pszName, FTX_SCREEN ** ppScreen); - FTKEXPC RCODE FLMAPI FTXCaptureScreen( + FTKXPC RCODE FTKAPI FTXCaptureScreen( FLMBYTE * pText, FLMBYTE * pForeAttrib, FLMBYTE * pBackAttrib); - FTKEXPC void FLMAPI FTXRefresh( void); + FTKXPC void FTKAPI FTXRefresh( void); - FTKEXPC void FLMAPI FTXSetRefreshState( + FTKXPC void FTKAPI FTXSetRefreshState( FLMBOOL bDisable); - FTKEXPC FLMBOOL FLMAPI FTXRefreshDisabled( void); + FTKXPC FLMBOOL FTKAPI FTXRefreshDisabled( void); - FTKEXPC RCODE FLMAPI FTXAddKey( + FTKXPC RCODE FTKAPI FTXAddKey( FLMUINT uiKey); - FTKEXPC RCODE FLMAPI FTXWinInit( + FTKXPC RCODE FTKAPI FTXWinInit( FTX_SCREEN * pScreen, FLMUINT uiCols, FLMUINT uiRows, FTX_WINDOW ** ppWindow); - FTKEXPC void FLMAPI FTXWinFree( + FTKXPC void FTKAPI FTXWinFree( FTX_WINDOW ** ppWindow); - FTKEXPC RCODE FLMAPI FTXWinOpen( + FTKXPC RCODE FTKAPI FTXWinOpen( FTX_WINDOW * pWindow); - FTKEXPC RCODE FLMAPI FTXWinSetName( + FTKXPC RCODE FTKAPI FTXWinSetName( FTX_WINDOW * pWindow, char * pszName); - FTKEXPC void FLMAPI FTXWinClose( + FTKXPC void FTKAPI FTXWinClose( FTX_WINDOW * pWindow); - FTKEXPC void FLMAPI FTXWinSetFocus( + FTKXPC void FTKAPI FTXWinSetFocus( FTX_WINDOW * pWindow); - FTKEXPC void FLMAPI FTXWinPrintChar( + FTKXPC void FTKAPI FTXWinPrintChar( FTX_WINDOW * pWindow, FLMUINT uiChar); - FTKEXPC void FLMAPI FTXWinPrintStr( + FTKXPC void FTKAPI FTXWinPrintStr( FTX_WINDOW * pWindow, const char * pszString); - FTKEXPC void FLMAPI FTXWinPrintf( + FTKXPC void FTKAPI FTXWinPrintf( FTX_WINDOW * pWindow, const char * pszFormat, ...); - FTKEXPC void FLMAPI FTXWinCPrintf( + FTKXPC void FTKAPI FTXWinCPrintf( FTX_WINDOW * pWindow, eColorType backgroundColor, eColorType foregroundColor, const char * pszFormat, ...); - FTKEXPC void FLMAPI FTXWinPrintStrXY( + FTKXPC void FTKAPI FTXWinPrintStrXY( FTX_WINDOW * pWindow, const char * pszString, FLMUINT uiCol, FLMUINT uiRow); - FTKEXPC void FLMAPI FTXWinMove( + FTKXPC void FTKAPI FTXWinMove( FTX_WINDOW * pWindow, FLMUINT uiCol, FLMUINT uiRow); - FTKEXPC void FLMAPI FTXWinPaintBackground( + FTKXPC void FTKAPI FTXWinPaintBackground( FTX_WINDOW * pWindow, eColorType backgroundColor); - FTKEXPC void FLMAPI FTXWinPaintForeground( + FTKXPC void FTKAPI FTXWinPaintForeground( FTX_WINDOW * pWindow, eColorType foregroundColor); - FTKEXPC void FLMAPI FTXWinPaintRow( + FTKXPC void FTKAPI FTXWinPaintRow( FTX_WINDOW * pWindow, eColorType * pBackgroundColor, eColorType * pForegroundColor, FLMUINT uiRow); - FTKEXPC void FLMAPI FTXWinSetChar( + FTKXPC void FTKAPI FTXWinSetChar( FTX_WINDOW * pWindow, FLMUINT uiChar); - FTKEXPC void FLMAPI FTXWinPaintRowForeground( + FTKXPC void FTKAPI FTXWinPaintRowForeground( FTX_WINDOW * pWindow, eColorType foregroundColor, FLMUINT uiRow); - FTKEXPC void FLMAPI FTXWinPaintRowBackground( + FTKXPC void FTKAPI FTXWinPaintRowBackground( FTX_WINDOW * pWindow, eColorType backgroundColor, FLMUINT uiRow); - FTKEXPC void FLMAPI FTXWinSetBackFore( + FTKXPC void FTKAPI FTXWinSetBackFore( FTX_WINDOW * pWindow, eColorType backgroundColor, eColorType foregroundColor); - FTKEXPC void FLMAPI FTXWinGetCanvasSize( + FTKXPC void FTKAPI FTXWinGetCanvasSize( FTX_WINDOW * pWindow, FLMUINT * puiNumCols, FLMUINT * puiNumRows); - FTKEXPC void FLMAPI FTXWinGetSize( + FTKXPC void FTKAPI FTXWinGetSize( FTX_WINDOW * pWindow, FLMUINT * puiNumCols, FLMUINT * puiNumRows); - FTKEXPC FLMUINT FLMAPI FTXWinGetCurrRow( + FTKXPC FLMUINT FTKAPI FTXWinGetCurrRow( FTX_WINDOW * pWindow); - FTKEXPC FLMUINT FLMAPI FTXWinGetCurrCol( + FTKXPC FLMUINT FTKAPI FTXWinGetCurrCol( FTX_WINDOW * pWindow); - FTKEXPC void FLMAPI FTXWinGetBackFore( + FTKXPC void FTKAPI FTXWinGetBackFore( FTX_WINDOW * pWindow, eColorType * pBackgroundColor, eColorType * pForegroundColor); - FTKEXPC void FLMAPI FTXWinDrawBorder( + FTKXPC void FTKAPI FTXWinDrawBorder( FTX_WINDOW * pWindow); - FTKEXPC void FLMAPI FTXWinSetTitle( + FTKXPC void FTKAPI FTXWinSetTitle( FTX_WINDOW * pWindow, const char * pszTitle, eColorType backgroundColor, eColorType foregroundColor); - FTKEXPC void FLMAPI FTXWinSetHelp( + FTKXPC void FTKAPI FTXWinSetHelp( FTX_WINDOW * pWindow, const char * pszHelp, eColorType backgroundColor, eColorType foregroundColor); - FTKEXPC RCODE FLMAPI FTXLineEdit( + FTKXPC RCODE FTKAPI FTXLineEdit( FTX_WINDOW * pWindow, char * pszBuffer, FLMUINT uiBufSize, @@ -6124,76 +6118,76 @@ FLMUINT * puiCharCount, FLMUINT * puiTermChar); - FTKEXPC FLMUINT FLMAPI FTXLineEd( + FTKXPC FLMUINT FTKAPI FTXLineEd( FTX_WINDOW * pWindow, char * pszBuffer, FLMUINT uiBufSize); - FTKEXPC void FLMAPI FTXWinSetCursorPos( + FTKXPC void FTKAPI FTXWinSetCursorPos( FTX_WINDOW * pWindow, FLMUINT uiCol, FLMUINT uiRow); - FTKEXPC void FLMAPI FTXWinGetCursorPos( + FTKXPC void FTKAPI FTXWinGetCursorPos( FTX_WINDOW * pWindow, FLMUINT * puiCol, FLMUINT * puiRow); - FTKEXPC void FLMAPI FTXWinClear( + FTKXPC void FTKAPI FTXWinClear( FTX_WINDOW * pWindow); - FTKEXPC void FLMAPI FTXWinClearXY( + FTKXPC void FTKAPI FTXWinClearXY( FTX_WINDOW * pWindow, FLMUINT uiCol, FLMUINT uiRow); - FTKEXPC void FLMAPI FTXWinClearLine( + FTKXPC void FTKAPI FTXWinClearLine( FTX_WINDOW * pWindow, FLMUINT uiCol, FLMUINT uiRow); - FTKEXPC void FLMAPI FTXWinClearToEOL( + FTKXPC void FTKAPI FTXWinClearToEOL( FTX_WINDOW * pWindow); - FTKEXPC void FLMAPI FTXWinSetCursorType( + FTKXPC void FTKAPI FTXWinSetCursorType( FTX_WINDOW * pWindow, FLMUINT uiType); - FTKEXPC FLMUINT FLMAPI FTXWinGetCursorType( + FTKXPC FLMUINT FTKAPI FTXWinGetCursorType( FTX_WINDOW * pWindow); - FTKEXPC RCODE FLMAPI FTXWinInputChar( + FTKXPC RCODE FTKAPI FTXWinInputChar( FTX_WINDOW * pWindow, FLMUINT * puiChar); - FTKEXPC RCODE FLMAPI FTXWinTestKB( + FTKXPC RCODE FTKAPI FTXWinTestKB( FTX_WINDOW * pWindow); - FTKEXPC void FLMAPI FTXWinSetScroll( + FTKXPC void FTKAPI FTXWinSetScroll( FTX_WINDOW * pWindow, FLMBOOL bScroll); - FTKEXPC void FLMAPI FTXWinSetLineWrap( + FTKXPC void FTKAPI FTXWinSetLineWrap( FTX_WINDOW * pWindow, FLMBOOL bLineWrap); - FTKEXPC void FLMAPI FTXWinGetScroll( + FTKXPC void FTKAPI FTXWinGetScroll( FTX_WINDOW * pWindow, FLMBOOL * pbScroll); - FTKEXPC RCODE FLMAPI FTXWinGetScreen( + FTKXPC RCODE FTKAPI FTXWinGetScreen( FTX_WINDOW * pWindow, FTX_SCREEN ** ppScreen); - FTKEXPC RCODE FLMAPI FTXWinGetPosition( + FTKXPC RCODE FTKAPI FTXWinGetPosition( FTX_WINDOW * pWindow, FLMUINT * puiCol, FLMUINT * puiRow); - FTKEXPC void FLMAPI FTXScreenFree( + FTKXPC void FTKAPI FTXScreenFree( FTX_SCREEN ** ppScreen); - FTKEXPC RCODE FLMAPI FTXScreenInitStandardWindows( + FTKXPC RCODE FTKAPI FTXScreenInitStandardWindows( FTX_SCREEN * pScreen, eColorType titleBackColor, eColorType titleForeColor, @@ -6205,19 +6199,19 @@ FTX_WINDOW ** ppTitleWin, FTX_WINDOW ** ppMainWin); - FTKEXPC void FLMAPI FTXScreenSetShutdownFlag( + FTKXPC void FTKAPI FTXScreenSetShutdownFlag( FTX_SCREEN * pScreen, FLMBOOL * pbShutdownFlag); - FTKEXPC RCODE FLMAPI FTXScreenDisplay( + FTKXPC RCODE FTKAPI FTXScreenDisplay( FTX_SCREEN * pScreen); - FTKEXPC RCODE FLMAPI FTXScreenGetSize( + FTKXPC RCODE FTKAPI FTXScreenGetSize( FTX_SCREEN * pScreen, FLMUINT * puiNumCols, FLMUINT * puiNumRows); - FTKEXPC RCODE FLMAPI FTXMessageWindow( + FTKXPC RCODE FTKAPI FTXMessageWindow( FTX_SCREEN * pScreen, eColorType backgroundColor, eColorType foregroundColor, @@ -6225,7 +6219,7 @@ const char * pszMessage2, FTX_WINDOW ** ppWindow); - FTKEXPC RCODE FLMAPI FTXDisplayMessage( + FTKXPC RCODE FTKAPI FTXDisplayMessage( FTX_SCREEN * pScreen, eColorType backgroundColor, eColorType foregroundColor, @@ -6233,79 +6227,79 @@ const char * pszMessage2, FLMUINT * puiTermChar); - FTKEXPC RCODE FLMAPI FTXDisplayScrollWindow( + FTKXPC RCODE FTKAPI FTXDisplayScrollWindow( FTX_SCREEN * pScreen, const char * pszTitle, const char * pszMessage, FLMUINT uiCols, FLMUINT uiRows); - FTKEXPC RCODE FLMAPI FTXGetInput( + FTKXPC RCODE FTKAPI FTXGetInput( FTX_SCREEN * pScreen, const char * pszMessage, char * pszResponse, FLMUINT uiMaxRespLen, FLMUINT * puiTermChar); - FTKEXPC void FLMAPI FTXBeep( void); + FTKXPC void FTKAPI FTXBeep( void); - FTKEXPC RCODE FLMAPI f_conInit( + FTKXPC RCODE FTKAPI f_conInit( FLMUINT uiRows, FLMUINT uiCols, const char * pszTitle); - FTKEXPC void FLMAPI f_conExit( void); + FTKXPC void FTKAPI f_conExit( void); - FTKEXPC void FLMAPI f_conGetScreenSize( + FTKXPC void FTKAPI f_conGetScreenSize( FLMUINT * puiNumColsRV, FLMUINT * puiNumRowsRV); - FTKEXPC void FLMAPI f_conDrawBorder( void); + FTKXPC void FTKAPI f_conDrawBorder( void); - FTKEXPC void FLMAPI f_conStrOut( + FTKXPC void FTKAPI f_conStrOut( const char * pszString); - FTKEXPC void FLMAPI f_conStrOutXY( + FTKXPC void FTKAPI f_conStrOutXY( const char * pszString, FLMUINT uiCol, FLMUINT uiRow); - FTKEXPC void FLMAPI f_conPrintf( + FTKXPC void FTKAPI f_conPrintf( const char * pszFormat, ...); - FTKEXPC void FLMAPI f_conCPrintf( + FTKXPC void FTKAPI f_conCPrintf( eColorType back, eColorType fore, const char * pszFormat, ...); - FTKEXPC void FLMAPI f_conClearScreen( + FTKXPC void FTKAPI f_conClearScreen( FLMUINT uiCol, FLMUINT uiRow); - FTKEXPC void FLMAPI f_conClearLine( + FTKXPC void FTKAPI f_conClearLine( FLMUINT uiCol, FLMUINT uiRow); - FTKEXPC void FLMAPI f_conSetBackFore( + FTKXPC void FTKAPI f_conSetBackFore( eColorType backColor, eColorType foreColor); - FTKEXPC FLMUINT FLMAPI f_conGetCursorColumn( void); + FTKXPC FLMUINT FTKAPI f_conGetCursorColumn( void); - FTKEXPC FLMUINT FLMAPI f_conGetCursorRow( void); + FTKXPC FLMUINT FTKAPI f_conGetCursorRow( void); - FTKEXPC void FLMAPI f_conSetCursorType( + FTKXPC void FTKAPI f_conSetCursorType( FLMUINT uiType); - FTKEXPC void FLMAPI f_conSetCursorPos( + FTKXPC void FTKAPI f_conSetCursorPos( FLMUINT uiCol, FLMUINT uiRow); - FTKEXPC FLMUINT FLMAPI f_conGetKey( void); + FTKXPC FLMUINT FTKAPI f_conGetKey( void); - FTKEXPC FLMBOOL FLMAPI f_conHaveKey( void); + FTKXPC FLMBOOL FTKAPI f_conHaveKey( void); - FTKEXPC FLMUINT FLMAPI f_conLineEdit( + FTKXPC FLMUINT FTKAPI f_conLineEdit( char * pszString, FLMUINT uiMaxLen); @@ -6327,26 +6321,26 @@ virtual ~F_BufferIStream(); - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( const char * pucBuffer, FLMUINT uiLength, char ** ppucAllocatedBuffer = NULL); - FINLINE FLMUINT64 FLMAPI totalSize( void) + FINLINE FLMUINT64 FTKAPI totalSize( void) { f_assert( m_bIsOpen); return( m_uiBufferLen); } - FINLINE FLMUINT64 FLMAPI remainingSize( void) + FINLINE FLMUINT64 FTKAPI remainingSize( void) { f_assert( m_bIsOpen); return( m_uiBufferLen - m_uiOffset); } - RCODE FLMAPI closeStream( void); + RCODE FTKAPI closeStream( void); - FINLINE RCODE FLMAPI positionTo( + FINLINE RCODE FTKAPI positionTo( FLMUINT64 ui64Position) { f_assert( m_bIsOpen); @@ -6363,13 +6357,13 @@ return( NE_FLM_OK); } - FINLINE FLMUINT64 FLMAPI getCurrPosition( void) + FINLINE FLMUINT64 FTKAPI getCurrPosition( void) { f_assert( m_bIsOpen); return( m_uiOffset); } - FINLINE void FLMAPI truncateStream( + FINLINE void FTKAPI truncateStream( FLMUINT64 ui64Offset = 0) { f_assert( m_bIsOpen); @@ -6379,7 +6373,7 @@ m_uiBufferLen = (FLMUINT)ui64Offset; } - RCODE FLMAPI read( + RCODE FTKAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); @@ -6390,7 +6384,7 @@ return( m_pucBuffer); } - FINLINE const FLMBYTE * FLMAPI getBufferAtCurrentOffset( void) + FINLINE const FLMBYTE * FTKAPI getBufferAtCurrentOffset( void) { f_assert( m_bIsOpen); return( m_pucBuffer ? &m_pucBuffer[ m_uiOffset] : NULL); @@ -6431,21 +6425,21 @@ } } - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( const char * pszPath); - RCODE FLMAPI closeStream( void); + RCODE FTKAPI closeStream( void); - RCODE FLMAPI positionTo( + RCODE FTKAPI positionTo( FLMUINT64 ui64Position); - FLMUINT64 FLMAPI totalSize( void); + FLMUINT64 FTKAPI totalSize( void); - FLMUINT64 FLMAPI remainingSize( void); + FLMUINT64 FTKAPI remainingSize( void); - FLMUINT64 FLMAPI getCurrPosition( void); + FLMUINT64 FTKAPI getCurrPosition( void); - RCODE FLMAPI read( + RCODE FTKAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); @@ -6474,18 +6468,18 @@ closeStream(); } - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( IF_IStream * pIStream, FLMUINT uiBufferSize); - RCODE FLMAPI read( + RCODE FTKAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - RCODE FLMAPI closeStream( void); + RCODE FTKAPI closeStream( void); - FINLINE FLMUINT64 FLMAPI totalSize( void) + FINLINE FLMUINT64 FTKAPI totalSize( void) { if (!m_pIStream) { @@ -6496,7 +6490,7 @@ return( m_uiBytesAvail); } - FINLINE FLMUINT64 FLMAPI remainingSize( void) + FINLINE FLMUINT64 FTKAPI remainingSize( void) { if( !m_pIStream) { @@ -6507,7 +6501,7 @@ return( m_uiBytesAvail - m_uiBufferOffset); } - FINLINE RCODE FLMAPI positionTo( + FINLINE RCODE FTKAPI positionTo( FLMUINT64 ui64Position) { if( !m_pIStream) @@ -6528,7 +6522,7 @@ return( NE_FLM_OK); } - FINLINE FLMUINT64 FLMAPI getCurrPosition( void) + FINLINE FLMUINT64 FTKAPI getCurrPosition( void) { if( !m_pIStream) { @@ -6566,18 +6560,18 @@ closeStream(); } - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( IF_OStream * pOStream, FLMUINT uiBufferSize); - RCODE FLMAPI write( + RCODE FTKAPI write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten); - RCODE FLMAPI closeStream( void); + RCODE FTKAPI closeStream( void); - RCODE FLMAPI flush( void); + RCODE FTKAPI flush( void); private: @@ -6604,16 +6598,16 @@ closeStream(); } - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( const char * pszFilePath, FLMBOOL bTruncateIfExists); - RCODE FLMAPI write( + RCODE FTKAPI write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten); - RCODE FLMAPI closeStream( void); + RCODE FTKAPI closeStream( void); private: @@ -6639,16 +6633,16 @@ closeStream(); } - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( const char * pszDirectory, const char * pszBaseName); - RCODE FLMAPI read( + RCODE FTKAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - RCODE FLMAPI closeStream( void); + RCODE FTKAPI closeStream( void); private: @@ -6687,12 +6681,12 @@ FLMUINT uiMaxFileSize, FLMBOOL bOkToOverwrite); - RCODE FLMAPI write( + RCODE FTKAPI write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten); - RCODE FLMAPI closeStream( void); + RCODE FTKAPI closeStream( void); RCODE processDirectory( const char * pszDirectory, @@ -6736,7 +6730,7 @@ } } - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( IF_PosIStream * pIStream, FLMBOOL bUnicodeStream, FLMUINT uiLanguage, @@ -6761,7 +6755,7 @@ return( NE_FLM_OK); } - RCODE FLMAPI closeStream( void) + RCODE FTKAPI closeStream( void) { if( m_pIStream) { @@ -6772,7 +6766,7 @@ return( NE_FLM_OK); } - RCODE FLMAPI read( + RCODE FTKAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead) @@ -6790,7 +6784,7 @@ return( rc); } - RCODE FLMAPI read( + RCODE FTKAPI read( FLMBOOL bAllowTwoIntoOne, FLMUNICODE * puChar, FLMBOOL * pbCharIsWild, @@ -6798,7 +6792,7 @@ FLMUINT16 * pui16SubCol, FLMBYTE * pucCase); - FINLINE FLMUINT64 FLMAPI totalSize( void) + FINLINE FLMUINT64 FTKAPI totalSize( void) { if( m_pIStream) { @@ -6808,7 +6802,7 @@ return( 0); } - FINLINE FLMUINT64 FLMAPI remainingSize( void) + FINLINE FLMUINT64 FTKAPI remainingSize( void) { if( m_pIStream) { @@ -6818,13 +6812,13 @@ return( 0); } - FINLINE RCODE FLMAPI positionTo( + FINLINE RCODE FTKAPI positionTo( FLMUINT64) { return( RC_SET_AND_ASSERT( NE_FLM_NOT_IMPLEMENTED)); } - FINLINE RCODE FLMAPI positionTo( + FINLINE RCODE FTKAPI positionTo( F_CollStreamPos * pPos) { @@ -6836,13 +6830,13 @@ return( m_pIStream->positionTo( pPos->ui64Position)); } - FINLINE FLMUINT64 FLMAPI getCurrPosition( void) + FINLINE FLMUINT64 FTKAPI getCurrPosition( void) { flmAssert( 0); return( 0); } - void FLMAPI getCurrPosition( + void FTKAPI getCurrPosition( F_CollStreamPos * pPos); private: @@ -6902,15 +6896,15 @@ closeStream(); } - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( IF_IStream * pIStream); - RCODE FLMAPI read( + RCODE FTKAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FINLINE RCODE FLMAPI closeStream( void) + FINLINE RCODE FTKAPI closeStream( void) { RCODE rc = NE_FLM_OK; @@ -6939,7 +6933,7 @@ FLMBYTE m_ucBuffer[ 8]; }; - FTKEXPC RCODE FLMAPI f_base64Encode( + FTKXPC RCODE FTKAPI f_base64Encode( const char * pData, FLMUINT uiDataLength, F_DynaBuf * pBuffer); @@ -6961,16 +6955,16 @@ closeStream(); } - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( IF_IStream * pIStream, FLMBOOL bLineBreaks); - RCODE FLMAPI read( + RCODE FTKAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FINLINE RCODE FLMAPI closeStream( void) + FINLINE RCODE FTKAPI closeStream( void) { RCODE rc = NE_FLM_OK; @@ -7030,15 +7024,15 @@ closeStream(); } - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( IF_OStream * pOStream); - RCODE FLMAPI write( + RCODE FTKAPI write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten); - RCODE FLMAPI closeStream( void); + RCODE FTKAPI closeStream( void); private: @@ -7095,15 +7089,15 @@ closeStream(); } - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( IF_IStream * pIStream); - RCODE FLMAPI read( + RCODE FTKAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - RCODE FLMAPI closeStream( void); + RCODE FTKAPI closeStream( void); private: @@ -7223,11 +7217,11 @@ } } - RCODE FLMAPI setup( + RCODE FTKAPI setup( char * pszTmpDir, FLMUINT uiEntrySize); - FINLINE void FLMAPI setCompareFunc( + FINLINE void FTKAPI setCompareFunc( F_DYNSET_COMPARE_FUNC fnCompare, void * pvUserData) { @@ -7236,22 +7230,22 @@ m_pAccess->setCompareFunc( fnCompare, pvUserData); } - RCODE FLMAPI addEntry( + RCODE FTKAPI addEntry( void * pvEntry); - FINLINE RCODE FLMAPI findMatch( + FINLINE RCODE FTKAPI findMatch( void * pvMatchEntry, void * pvFoundEntry) { return m_pAccess->search( pvMatchEntry, pvFoundEntry); } - FINLINE FLMUINT FLMAPI getEntrySize( void) + FINLINE FLMUINT FTKAPI getEntrySize( void) { return m_uiEntrySize; } - FINLINE FLMUINT FLMAPI getTotalEntries( void) + FINLINE FLMUINT FTKAPI getTotalEntries( void) { return( m_pAccess->getTotalEntries()); } @@ -7275,16 +7269,16 @@ FLMUINT uiHashValue; } F_BUCKET; - FTKEXPC RCODE FLMAPI f_allocHashTable( + FTKXPC RCODE FTKAPI f_allocHashTable( FLMUINT uiHashTblSize, F_BUCKET ** ppHashTblRV); - FTKEXPC FLMUINT FLMAPI f_strHashBucket( + FTKXPC FLMUINT FTKAPI f_strHashBucket( char * pszStr, F_BUCKET * pHashTbl, FLMUINT uiNumBuckets); - FTKEXPC FLMUINT FLMAPI f_binHashBucket( + FTKXPC FLMUINT FTKAPI f_binHashBucket( void * pBuf, FLMUINT uiBufLen, F_BUCKET * pHashTbl, @@ -7319,31 +7313,31 @@ flmAssert( !getRefCount()); } - virtual const void * FLMAPI getKey( void) = 0; + virtual const void * FTKAPI getKey( void) = 0; - virtual FLMUINT FLMAPI getKeyLength( void) = 0; + virtual FLMUINT FTKAPI getKeyLength( void) = 0; - FINLINE FLMUINT FLMAPI getKeyCRC( void) + FINLINE FLMUINT FTKAPI getKeyCRC( void) { return( m_ui32KeyCRC); } - FINLINE FLMUINT FLMAPI getHashBucket( void) + FINLINE FLMUINT FTKAPI getHashBucket( void) { return( m_uiHashBucket); } - FINLINE F_HashObject * FLMAPI getNextInGlobal( void) + FINLINE F_HashObject * FTKAPI getNextInGlobal( void) { return( m_pNextInGlobal); } - FINLINE F_HashObject * FLMAPI getNextInBucket( void) + FINLINE F_HashObject * FTKAPI getNextInBucket( void) { return( m_pNextInBucket); } - virtual FLMUINT FLMAPI getObjectType( void) = 0; + virtual FLMUINT FTKAPI getObjectType( void) = 0; protected: @@ -7375,42 +7369,42 @@ virtual ~F_HashTable(); - RCODE FLMAPI setupHashTable( + RCODE FTKAPI setupHashTable( FLMBOOL bMultithreaded, FLMUINT uiNumBuckets, FLMUINT uiMaxObjects); - RCODE FLMAPI addObject( + RCODE FTKAPI addObject( F_HashObject * pObject, FLMBOOL bAllowDuplicates = FALSE); - RCODE FLMAPI getNextObjectInGlobal( + RCODE FTKAPI getNextObjectInGlobal( F_HashObject ** ppObject); - RCODE FLMAPI getNextObjectInBucket( + RCODE FTKAPI getNextObjectInBucket( F_HashObject ** ppObject); - RCODE FLMAPI getObject( + RCODE FTKAPI getObject( const void * pvKey, FLMUINT uiKeyLen, F_HashObject ** ppObject, FLMBOOL bRemove = FALSE); - RCODE FLMAPI removeObject( + RCODE FTKAPI removeObject( void * pvKey, FLMUINT uiKeyLen); - RCODE FLMAPI removeObject( + RCODE FTKAPI removeObject( F_HashObject * pObject); - void FLMAPI removeAllObjects( void); + void FTKAPI removeAllObjects( void); - void FLMAPI removeAgedObjects( + void FTKAPI removeAgedObjects( FLMUINT uiMaxAge); - FLMUINT FLMAPI getMaxObjects( void); + FLMUINT FTKAPI getMaxObjects( void); - RCODE FLMAPI setMaxObjects( + RCODE FTKAPI setMaxObjects( FLMUINT uiMaxObjects); private: @@ -7479,10 +7473,10 @@ virtual ~F_ArgSet(); - RCODE FLMAPI setup( + RCODE FTKAPI setup( IF_PrintfClient * pPrintfClient); - RCODE FLMAPI addArg( + RCODE FTKAPI addArg( const char * pszIdentifier, const char * pszShortHelp, FLMBOOL bCaseSensitive, @@ -7490,21 +7484,21 @@ F_ARG_CONTENT_TYPE contentType, ...); - RCODE FLMAPI parseCommandLine( + RCODE FTKAPI parseCommandLine( FLMUINT uiArgc, const char ** ppszArgv); - FLMBOOL FLMAPI argIsPresent( + FLMBOOL FTKAPI argIsPresent( const char * pszIdentifier); - FLMUINT FLMAPI getValueCount( + FLMUINT FTKAPI getValueCount( const char * pszIdentifier); - FLMUINT FLMAPI getUINT( + FLMUINT FTKAPI getUINT( const char * pszIdentifier, FLMUINT uiIndex = 0); - FLMINT FLMAPI getINT( + FLMINT FTKAPI getINT( const char * pszIdentifier, FLMUINT uiIndex = 0); @@ -7519,15 +7513,15 @@ // NULL case-insensitive // * anything else is a user error - FLMBOOL FLMAPI getBOOL( + FLMBOOL FTKAPI getBOOL( const char * pszIdentifier, FLMUINT uiIndex = 0); - const char * FLMAPI getString( + const char * FTKAPI getString( const char * pszIdentifier, FLMUINT uiIndex = 0); - void FLMAPI getString( + void FTKAPI getString( const char * pszIdentifier, char * pszDestination, FLMUINT uiDestinationBufferSize, diff --git a/ftk/src/ftkarg.cpp b/ftk/src/ftkarg.cpp index d3d50c1..2dea8c1 100644 --- a/ftk/src/ftkarg.cpp +++ b/ftk/src/ftkarg.cpp @@ -452,7 +452,7 @@ F_ArgSet::~F_ArgSet() /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_ArgSet::setup( +RCODE FTKAPI F_ArgSet::setup( IF_PrintfClient * pPrintfClient) { RCODE rc = NE_FLM_OK; @@ -2036,7 +2036,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI F_ArgSet::argIsPresent( +FLMBOOL FTKAPI F_ArgSet::argIsPresent( const char * pszIdentifier) { return( getArg( pszIdentifier)->isPresent()); @@ -2045,7 +2045,7 @@ FLMBOOL FLMAPI F_ArgSet::argIsPresent( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_ArgSet::getValueCount( +FLMUINT FTKAPI F_ArgSet::getValueCount( const char * pszIdentifier) { return( getArg( pszIdentifier)->getValueCount()); @@ -2054,7 +2054,7 @@ FLMUINT FLMAPI F_ArgSet::getValueCount( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_ArgSet::getUINT( +FLMUINT FTKAPI F_ArgSet::getUINT( const char * pszIdentifier, FLMUINT uiIndex) { @@ -2064,7 +2064,7 @@ FLMUINT FLMAPI F_ArgSet::getUINT( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI F_ArgSet::getINT( +FLMINT FTKAPI F_ArgSet::getINT( const char * pszIdentifier, FLMUINT uiIndex) { @@ -2074,7 +2074,7 @@ FLMINT FLMAPI F_ArgSet::getINT( /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI F_ArgSet::getBOOL( +FLMBOOL FTKAPI F_ArgSet::getBOOL( const char * pszIdentifier, FLMUINT uiIndex) { @@ -2084,7 +2084,7 @@ FLMBOOL FLMAPI F_ArgSet::getBOOL( /**************************************************************************** Desc: ****************************************************************************/ -const char * FLMAPI F_ArgSet::getString( +const char * FTKAPI F_ArgSet::getString( const char * pszIdentifier, FLMUINT uiIndex) { @@ -2094,7 +2094,7 @@ const char * FLMAPI F_ArgSet::getString( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_ArgSet::getString( +void FTKAPI F_ArgSet::getString( const char * pszIdentifier, char * pszDestination, FLMUINT uiDestinationBufferSize, diff --git a/ftk/src/ftkbtree.cpp b/ftk/src/ftkbtree.cpp index ca329b0..fb444da 100644 --- a/ftk/src/ftkbtree.cpp +++ b/ftk/src/ftkbtree.cpp @@ -271,23 +271,23 @@ public: RCODE setup( FLMUINT uiBlockSize); - FLMUINT FLMAPI getBlockSize( void); + FLMUINT FTKAPI getBlockSize( void); - RCODE FLMAPI getBlock( + RCODE FTKAPI getBlock( FLMUINT32 ui32BlockAddr, IF_Block ** ppBlock, FLMBYTE ** ppucBlock); - RCODE FLMAPI createBlock( + RCODE FTKAPI createBlock( IF_Block ** ppBlock, FLMBYTE ** ppucBlock, FLMUINT32 * pui32BlockAddr); - RCODE FLMAPI freeBlock( + RCODE FTKAPI freeBlock( IF_Block ** ppBlock, FLMBYTE ** ppucBlock); - RCODE FLMAPI prepareForUpdate( + RCODE FTKAPI prepareForUpdate( IF_Block ** ppBlock, FLMBYTE ** ppucBlock); @@ -313,34 +313,34 @@ public: virtual ~F_BTree( void); - RCODE FLMAPI btCreate( + RCODE FTKAPI btCreate( FLMUINT16 ui16BtreeId, FLMBOOL bCounts, FLMBOOL bData, FLMUINT32 * pui32RootBlockAddr, IF_ResultSetCompare * pCompare = NULL); - RCODE FLMAPI btOpen( + RCODE FTKAPI btOpen( FLMUINT32 ui32RootBlockAddr, FLMBOOL bCounts, FLMBOOL bData, IF_ResultSetCompare * pCompare = NULL); - void FLMAPI btClose( void); + void FTKAPI btClose( void); - RCODE FLMAPI btDeleteTree( + RCODE FTKAPI btDeleteTree( IF_DeleteStatus * ifpDeleteStatus); - RCODE FLMAPI btGetBlockChains( + RCODE FTKAPI btGetBlockChains( FLMUINT * puiBlockChains, FLMUINT * puiNumLevels); - RCODE FLMAPI btRemoveEntry( + RCODE FTKAPI btRemoveEntry( const FLMBYTE * pucKey, FLMUINT uiKeyBufSize, FLMUINT uiKeyLen); - RCODE FLMAPI btInsertEntry( + RCODE FTKAPI btInsertEntry( const FLMBYTE * pucKey, FLMUINT uiKeyBufSize, FLMUINT uiKeyLen, @@ -351,7 +351,7 @@ public: FLMUINT32 * pui32BlockAddr = NULL, FLMUINT * puiOffsetIndex = NULL); - RCODE FLMAPI btReplaceEntry( + RCODE FTKAPI btReplaceEntry( const FLMBYTE * pucKey, FLMUINT uiKeyBufSize, FLMUINT uiKeyLen, @@ -363,7 +363,7 @@ public: FLMUINT32 * pui32BlockAddr = NULL, FLMUINT * puiOffsetIndex = NULL); - RCODE FLMAPI btLocateEntry( + RCODE FTKAPI btLocateEntry( FLMBYTE * pucKey, FLMUINT uiKeyBufSize, FLMUINT * puiKeyLen, @@ -373,14 +373,14 @@ public: FLMUINT32 * pui32BlockAddr = NULL, FLMUINT * puiOffsetIndex = NULL); - RCODE FLMAPI btGetEntry( + RCODE FTKAPI btGetEntry( FLMBYTE * pucKey, FLMUINT uiKeyLen, FLMBYTE * pucData, FLMUINT uiDataBufSize, FLMUINT * puiDataLen); - RCODE FLMAPI btNextEntry( + RCODE FTKAPI btNextEntry( FLMBYTE * pucKey, FLMUINT uiKeyBufSize, FLMUINT * puiKeyLen, @@ -388,7 +388,7 @@ public: FLMUINT32 * pui32BlockAddr = NULL, FLMUINT * puiOffsetIndex = NULL); - RCODE FLMAPI btPrevEntry( + RCODE FTKAPI btPrevEntry( FLMBYTE * pucKey, FLMUINT uiKeyBufSize, FLMUINT * puiKeyLen, @@ -396,7 +396,7 @@ public: FLMUINT32 * pui32BlockAddr = NULL, FLMUINT * puiOffsetIndex = NULL); - RCODE FLMAPI btFirstEntry( + RCODE FTKAPI btFirstEntry( FLMBYTE * pucKey, FLMUINT uiKeyBufSize, FLMUINT * puiKeyLen, @@ -404,7 +404,7 @@ public: FLMUINT32 * pui32BlockAddr = NULL, FLMUINT * puiOffsetIndex = NULL); - RCODE FLMAPI btLastEntry( + RCODE FTKAPI btLastEntry( FLMBYTE * pucKey, FLMUINT uiKeyBufSize, FLMUINT * puiKeyLen, @@ -412,43 +412,43 @@ public: FLMUINT32 * pui32BlockAddr = NULL, FLMUINT * puiOffsetIndex = NULL); - RCODE FLMAPI btSetReadPosition( + RCODE FTKAPI btSetReadPosition( FLMBYTE * pucKey, FLMUINT uiKeyLen, FLMUINT uiPosition); - RCODE FLMAPI btGetReadPosition( + RCODE FTKAPI btGetReadPosition( FLMUINT * puiPosition); - RCODE FLMAPI btPositionTo( + RCODE FTKAPI btPositionTo( FLMUINT uiPosition, FLMBYTE * pucKey, FLMUINT uiKeyBufSize, FLMUINT * puiKeyLen); - RCODE FLMAPI btGetPosition( + RCODE FTKAPI btGetPosition( FLMUINT * puiPosition); -// RCODE FLMAPI btComputeCounts( +// RCODE FTKAPI btComputeCounts( // IF_BTree * pUntilBtree, // FLMUINT * puiBlockCount, // FLMUINT * puiKeyCount, // FLMBOOL * pbTotalsEstimated, // FLMUINT uiAvgBlockFullness); - RCODE FLMAPI btRewind( void); + RCODE FTKAPI btRewind( void); - FINLINE FLMBOOL FLMAPI btHasCounts( void) + FINLINE FLMBOOL FTKAPI btHasCounts( void) { return( m_bCounts); } - FINLINE FLMBOOL FLMAPI btHasData( void) + FINLINE FLMBOOL FTKAPI btHasData( void) { return( m_bTreeHoldsData); } - FINLINE void FLMAPI btResetBtree( void) + FINLINE void FTKAPI btResetBtree( void) { releaseBlocks( TRUE); m_bSetupForRead = FALSE; @@ -469,7 +469,7 @@ public: m_uiSearchLevel = F_BTREE_MAX_LEVELS; } - FLMUINT32 FLMAPI getRootBlockAddr( void) + FLMUINT32 FTKAPI getRootBlockAddr( void) { return( m_ui32RootBlockAddr); } @@ -12730,7 +12730,7 @@ Exit: /*************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_BlockMgr::getBlockSize( void) +FLMUINT FTKAPI F_BlockMgr::getBlockSize( void) { return( m_uiBlockSize); } @@ -12738,7 +12738,7 @@ FLMUINT FLMAPI F_BlockMgr::getBlockSize( void) /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_BlockMgr::getBlock( +RCODE FTKAPI F_BlockMgr::getBlock( FLMUINT32 ui32BlockAddr, IF_Block ** ppBlock, FLMBYTE ** ppucBlock) @@ -12771,7 +12771,7 @@ Exit: /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_BlockMgr::createBlock( +RCODE FTKAPI F_BlockMgr::createBlock( IF_Block ** ppBlock, FLMBYTE ** ppucBlock, FLMUINT32 * pui32BlockAddr) @@ -12821,7 +12821,7 @@ Exit: /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_BlockMgr::freeBlock( +RCODE FTKAPI F_BlockMgr::freeBlock( IF_Block **,// ppBlock, FLMBYTE **) // ppucBlock) { @@ -12836,7 +12836,7 @@ RCODE FLMAPI F_BlockMgr::freeBlock( /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_BlockMgr::prepareForUpdate( +RCODE FTKAPI F_BlockMgr::prepareForUpdate( IF_Block **, // ppBlock, FLMBYTE **) // ppucBlock) { @@ -12870,7 +12870,7 @@ void F_BlockMgr::freeAllBlocks( void) /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocBlockMgr( +RCODE FTKAPI FlmAllocBlockMgr( FLMUINT uiBlockSize, IF_BlockMgr ** ppBlockMgr) { @@ -12904,7 +12904,7 @@ Exit: /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocBTree( +RCODE FTKAPI FlmAllocBTree( IF_BlockMgr * pBlockMgr, IF_BTree ** ppBTree) { diff --git a/ftk/src/ftkcmem.cpp b/ftk/src/ftkcmem.cpp index 07e35b4..ccd850e 100644 --- a/ftk/src/ftkcmem.cpp +++ b/ftk/src/ftkcmem.cpp @@ -65,7 +65,7 @@ public: virtual ~F_BlockAlloc(); - RCODE FLMAPI setup( + RCODE FTKAPI setup( FLMBOOL bMultiThreaded, IF_SlabManager * pSlabManager, IF_Relocator * pRelocator, @@ -73,17 +73,17 @@ public: FLM_SLAB_USAGE * pUsageStats, FLMUINT * puiTotalBytesAllocated); - RCODE FLMAPI allocBlock( + RCODE FTKAPI allocBlock( void ** ppvBlock); - void FLMAPI freeBlock( + void FTKAPI freeBlock( void ** ppvBlock); - void FLMAPI freeUnused( void); + void FTKAPI freeUnused( void); - void FLMAPI freeAll( void); + void FTKAPI freeAll( void); - void FLMAPI defragmentMemory( void); + void FTKAPI defragmentMemory( void); private: @@ -148,11 +148,11 @@ public: { } - void FLMAPI relocate( + void FTKAPI relocate( void * pvOldAlloc, void * pvNewAlloc); - FLMBOOL FLMAPI canRelocate( + FLMBOOL FTKAPI canRelocate( void * pvOldAlloc); private: @@ -165,7 +165,7 @@ friend class F_BlockAlloc; /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI slabInfoAddrCompareFunc( +FLMINT FTKAPI slabInfoAddrCompareFunc( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -186,7 +186,7 @@ FLMINT FLMAPI slabInfoAddrCompareFunc( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI slabInfoAddrSwapFunc( +void FTKAPI slabInfoAddrSwapFunc( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -370,7 +370,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_BlockAlloc::allocBlock( +RCODE FTKAPI F_BlockAlloc::allocBlock( void ** ppvBlock) { RCODE rc = NE_FLM_OK; @@ -405,7 +405,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_BlockAlloc::freeBlock( +void FTKAPI F_BlockAlloc::freeBlock( void ** ppvBlock) { SLABINFO * pSlab = NULL; @@ -971,7 +971,7 @@ void F_BlockAlloc::freeSlab( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_BlockAlloc::freeAll( void) +void FTKAPI F_BlockAlloc::freeAll( void) { SLABINFO * pNextSlab; SLABINFO * pCurSlab; @@ -1015,7 +1015,7 @@ void FLMAPI F_BlockAlloc::freeAll( void) /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_BlockAlloc::freeUnused( void) // VISIT +void FTKAPI F_BlockAlloc::freeUnused( void) // VISIT { SLABINFO * pSlab; @@ -1331,7 +1331,7 @@ void F_SlabInfoRelocator::relocate( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocBlockAllocator( +RCODE FTKAPI FlmAllocBlockAllocator( IF_BlockAlloc ** ppBlockAllocator) { if( (*ppBlockAllocator = f_new F_BlockAlloc) == NULL) diff --git a/ftk/src/ftkcoll.cpp b/ftk/src/ftkcoll.cpp index 84a0a70..eae188d 100644 --- a/ftk/src/ftkcoll.cpp +++ b/ftk/src/ftkcoll.cpp @@ -5103,7 +5103,7 @@ FINLINE FLMUINT16 flmGetNextCharState( Desc: Convert a Unicode character to its WP equivalent Ret: Returns TRUE if the character could be converted ****************************************************************************/ -FLMBOOL FLMAPI f_unicodeToWP( +FLMBOOL FTKAPI f_unicodeToWP( FLMUNICODE uUniChar, // Unicode character to convert FLMUINT16 * pui16WPChar) // Returns 0 or WPChar converted. { @@ -5134,7 +5134,7 @@ Desc: Convert a Unicode character to its WP equivalent using the depricated FLAIM conversion rules Ret: Returns TRUE if the character could be converted ****************************************************************************/ -FLMBOOL FLMAPI f_depricatedUnicodeToWP( +FLMBOOL FTKAPI f_depricatedUnicodeToWP( FLMUNICODE uUniChar, // Unicode character to convert FLMUINT16 * pui16WPChar) // Returns 0 or WPChar converted. { @@ -5163,7 +5163,7 @@ FLMBOOL FLMAPI f_depricatedUnicodeToWP( /**************************************************************************** Desc: Convert a WP character to its Unicode equivalent ****************************************************************************/ -RCODE FLMAPI f_wpToUnicode( +RCODE FTKAPI f_wpToUnicode( FLMUINT16 ui16WPChar, FLMUNICODE * puUniChar) { @@ -5427,7 +5427,7 @@ Exit: /**************************************************************************** Desc: Converts a character to upper case (if possible) ****************************************************************************/ -FLMUINT16 FLMAPI f_wpUpper( +FLMUINT16 FTKAPI f_wpUpper( FLMUINT16 ui16WpChar) { if( ui16WpChar < 256) @@ -5508,7 +5508,7 @@ FLMUINT16 FLMAPI f_wpUpper( /**************************************************************************** Desc: Checks to see if WP character is upper case ****************************************************************************/ -FLMBOOL FLMAPI f_wpIsUpper( +FLMBOOL FTKAPI f_wpIsUpper( FLMUINT16 ui16WpChar) { FLMBYTE ucChar; @@ -5546,7 +5546,7 @@ FLMBOOL FLMAPI f_wpIsUpper( /**************************************************************************** Desc: Converts a character to lower case (if possible) ****************************************************************************/ -FLMUINT16 FLMAPI f_wpLower( +FLMUINT16 FTKAPI f_wpLower( FLMUINT16 ui16WpChar) { if( ui16WpChar < 256) @@ -5625,7 +5625,7 @@ FLMUINT16 FLMAPI f_wpLower( /**************************************************************************** Desc: Break a WP character into a base and a diacritical char. ****************************************************************************/ -FLMBOOL FLMAPI f_breakWPChar( +FLMBOOL FTKAPI f_breakWPChar( FLMUINT16 ui16WpChar, FLMUINT16 * pui16BaseChar, FLMUINT16 * pui16DiacriticChar) @@ -5682,7 +5682,7 @@ Ret: TRUE - if not found Notes: ascii characters with diacriticals are in multi-national if anywhere; all other base chars with diacritics are found in their own sets. ****************************************************************************/ -FLMBOOL FLMAPI f_combineWPChar( +FLMBOOL FTKAPI f_combineWPChar( FLMUINT16 * pui16WpChar, FLMUINT16 ui16BaseChar, FLMINT16 ui16DiacriticChar) @@ -5742,7 +5742,7 @@ FLMBOOL FLMAPI f_combineWPChar( Desc: Find the collating value of a WP character ret: Collating value (COLS0 is high value - undefined WP char) ***********************************************************************/ -FLMUINT16 FLMAPI f_wpGetCollationImp( +FLMUINT16 FTKAPI f_wpGetCollationImp( FLMUINT16 ui16WpChar, FLMUINT uiLanguage) { @@ -5836,7 +5836,7 @@ Return: 0 = nothing changes second character value if 1 character sorts as 2, *pui16WpChar changes to first character in sequence ****************************************************************************/ -RCODE FLMAPI f_wpCheckDoubleCollation( +RCODE FTKAPI f_wpCheckDoubleCollation( IF_PosIStream * pIStream, FLMBOOL bUnicodeStream, FLMBOOL bAllowTwoIntoOne, @@ -6082,7 +6082,7 @@ Return: 0 = nothing changes. Otherwise, *pui16WpChar is the first characters and treat as one (i.e, change the collation on the outside to one more than the collation of the first character). ****************************************************************************/ -FLMUINT16 FLMAPI f_wpCheckDoubleCollation( +FLMUINT16 FTKAPI f_wpCheckDoubleCollation( FLMUINT16 * pui16WpChar, FLMBOOL * pbTwoIntoOne, const FLMBYTE ** ppucInputStr, @@ -6530,7 +6530,7 @@ Desc: Convert a zenkaku (double wide) char to a hankaku (single wide) char Ret: Hankaku char or 0 if a conversion doesn't exist Notes: Taken from CHAR.ASM - zen2han_f routine ****************************************************************************/ -FLMUINT16 FLMAPI f_wpZenToHankaku( +FLMUINT16 FTKAPI f_wpZenToHankaku( FLMUINT16 ui16WpChar, FLMUINT16 * pui16DakutenOrHandakuten) { @@ -6683,7 +6683,7 @@ Ret: 0 = no conversion Notes: Taken from char.asm - han2zen() From8ToZen could be taken out and placed in code. ****************************************************************************/ -FLMUINT16 FLMAPI f_wpHanToZenkaku( +FLMUINT16 FTKAPI f_wpHanToZenkaku( FLMUINT16 ui16WpChar, FLMUINT16 ui16NextWpChar, FLMUINT16 * pui16Zenkaku) @@ -6873,7 +6873,7 @@ FLMUINT16 FLMAPI f_wpHanToZenkaku( /**************************************************************************** Desc: Converts a 2-byte language code into its corresponding language ID ****************************************************************************/ -FLMUINT FLMAPI f_languageToNum( +FLMUINT FTKAPI f_languageToNum( const char * pszLanguage) { FLMBYTE ucFirstChar = (FLMBYTE)(*pszLanguage); @@ -6898,7 +6898,7 @@ FLMUINT FLMAPI f_languageToNum( /**************************************************************************** Desc: Converts a language ID to its corresponding 2-byte language code ****************************************************************************/ -void FLMAPI f_languageToStr( +void FTKAPI f_languageToStr( FLMINT iLangNum, char * pszLanguage) { @@ -7470,7 +7470,7 @@ Exit: /*************************************************************************** Desc: Compare two entire strings. ****************************************************************************/ -RCODE FLMAPI f_compareCollStreams( +RCODE FTKAPI f_compareCollStreams( IF_CollIStream * pLStream, IF_CollIStream * pRStream, FLMBOOL bOpIsMatch, @@ -7734,7 +7734,7 @@ Exit: /*************************************************************************** Desc: ****************************************************************************/ -FLMUNICODE FLMAPI f_convertChar( +FLMUNICODE FTKAPI f_convertChar( FLMUNICODE uzChar, FLMUINT uiCompareRules) { @@ -7980,7 +7980,7 @@ Out: WP characters that have been modified to their original case Ret: Number of bytes used in the lower/upper buffer Notes: Only WP to lower case conversion is done here for each bit NOT set. ***************************************************************************/ -FLMUINT FLMAPI f_wpToMixed( +FLMUINT FTKAPI f_wpToMixed( FLMBYTE * pucWPStr, // Existing WP string to modify FLMUINT uiWPStrLen, // Length of the WP string in bytes const FLMBYTE * pucLowUpBitStr, // Lower/upper case bit string @@ -8056,7 +8056,7 @@ VISIT: If the string is EXACTLY the length of the truncation The code didn't match the design intent. Fix next major version. ****************************************************************************/ -RCODE FLMAPI flmUTF8ToColText( +RCODE FTKAPI flmUTF8ToColText( IF_PosIStream * pIStream, FLMBYTE * pucCollatedStr, // Returns collated string FLMUINT * puiCollatedStrLen, // Returns total collated string length @@ -8732,7 +8732,7 @@ Exit: /***************************************************************************** Desc: Convert a collated string to a WP word string *****************************************************************************/ -RCODE FLMAPI f_colStr2WPStr( +RCODE FTKAPI f_colStr2WPStr( const FLMBYTE * pucColStr, // Points to the collated string FLMUINT uiColStrLen, // Length of the collated string FLMBYTE * pucWPStr, // Output string to build - WP word string @@ -8998,7 +8998,7 @@ Exit: /**************************************************************************** Desc: Convert a text string to a collated string. ****************************************************************************/ -RCODE FLMAPI f_asiaUTF8ToColText( +RCODE FTKAPI f_asiaUTF8ToColText( IF_PosIStream * pIStream, FLMBYTE * pucColStr, // Output collated string FLMUINT * puiColStrLen, // Collated string length return value @@ -9319,7 +9319,7 @@ Notes: For each bit in the sub-collation section: 110 - align to next byte & take word value as extended character ****************************************************************************/ -RCODE FLMAPI f_asiaParseSubCol( +RCODE FTKAPI f_asiaParseSubCol( FLMBYTE * pucWPStr, FLMUINT * puiWPStrLen, FLMUINT uiMaxWPBytes, @@ -9731,7 +9731,7 @@ Exit: Desc: Get the original string from an asian collation string Ret: Length of the word string in bytes ****************************************************************************/ -RCODE FLMAPI f_asiaColStr2WPStr( +RCODE FTKAPI f_asiaColStr2WPStr( const FLMBYTE * pucColStr, // Points to the collated string FLMUINT uiColStrLen, // Length of the collated string FLMBYTE * pucWPStr, // Output string to build - WP word string @@ -10107,7 +10107,7 @@ Exit: /************************************************************************** Desc: ***************************************************************************/ -void FLMAPI F_CollIStream::getCurrPosition( +void FTKAPI F_CollIStream::getCurrPosition( F_CollStreamPos * pPos) { pPos->uNextChar = m_uNextChar; diff --git a/ftk/src/ftkcsum.cpp b/ftk/src/ftkcsum.cpp index a13a437..17e0ceb 100644 --- a/ftk/src/ftkcsum.cpp +++ b/ftk/src/ftkcsum.cpp @@ -596,7 +596,7 @@ Desc: Calculate the checksum for a block. NOTE: This is ALWAYS done that if the block needs to be converted before writing it out, it should be done before calculating the checksum. *********************************************************************/ -FLMUINT32 FLMAPI f_calcFastChecksum( +FLMUINT32 FTKAPI f_calcFastChecksum( const void * pvData, FLMUINT uiLength, FLMUINT * puiSum, @@ -728,7 +728,7 @@ Desc: Computes the CRC of the passed-in data buffer. Multiple calls can *pui32CRC should be initialized to 0xFFFFFFFF and the ones complement of the resulting CRC should be computed. *****************************************************************************/ -void FLMAPI f_updateCRC( +void FTKAPI f_updateCRC( const void * pvBuffer, FLMUINT uiCount, FLMUINT32 * pui32CRC) @@ -749,7 +749,7 @@ void FLMAPI f_updateCRC( /******************************************************************** Desc: *********************************************************************/ -FLMBYTE FLMAPI f_calcPacketChecksum( +FLMBYTE FTKAPI f_calcPacketChecksum( const void * pvPacket, FLMUINT uiBytesToChecksum) { diff --git a/ftk/src/ftkdir.cpp b/ftk/src/ftkdir.cpp index ba118c0..c5c1431 100644 --- a/ftk/src/ftkdir.cpp +++ b/ftk/src/ftkdir.cpp @@ -129,7 +129,7 @@ F_DirHdl::~F_DirHdl() /**************************************************************************** Desc: ****************************************************************************/ -const char * FLMAPI F_DirHdl::currentItemName( void) +const char * FTKAPI F_DirHdl::currentItemName( void) { const char * pszName = NULL; @@ -171,7 +171,7 @@ const char * FLMAPI F_DirHdl::currentItemName( void) /**************************************************************************** Desc: ****************************************************************************/ -FINLINE void FLMAPI F_DirHdl::currentItemPath( +FINLINE void FTKAPI F_DirHdl::currentItemPath( char * pszPath) { if( RC_OK( m_rc)) @@ -188,7 +188,7 @@ FINLINE void FLMAPI F_DirHdl::currentItemPath( /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI F_DirHdl::currentItemIsDir( void) +FLMBOOL FTKAPI F_DirHdl::currentItemIsDir( void) { #if defined( FLM_WIN) || defined( FLM_UNIX) || defined( FLM_LIBC_NLM) @@ -217,7 +217,7 @@ FLMBOOL FLMAPI F_DirHdl::currentItemIsDir( void) /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT64 FLMAPI F_DirHdl::currentItemSize( void) +FLMUINT64 FTKAPI F_DirHdl::currentItemSize( void) { FLMUINT64 ui64Size = 0; @@ -242,7 +242,7 @@ FLMUINT64 FLMAPI F_DirHdl::currentItemSize( void) Desc: Get the next item in a directory ****************************************************************************/ #if defined( FLM_WIN) || defined( FLM_UNIX) || defined( FLM_LIBC_NLM) -RCODE FLMAPI F_DirHdl::next( void) +RCODE FTKAPI F_DirHdl::next( void) { char szFoundPath[ F_PATH_MAX_SIZE]; char szDummyPath[ F_PATH_MAX_SIZE]; @@ -306,7 +306,7 @@ Exit: Desc: Get the next item in a directory ****************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI F_DirHdl::next( void) +RCODE FTKAPI F_DirHdl::next( void) { LONG lError = 0; IF_FileSystem * pFileSystem = f_getFileSysPtr(); @@ -353,7 +353,7 @@ Exit: Desc: Open a directory ****************************************************************************/ #ifndef FLM_RING_ZERO_NLM -RCODE FLMAPI F_DirHdl::openDir( +RCODE FTKAPI F_DirHdl::openDir( const char * pszDirName, const char * pszPattern) { @@ -405,7 +405,7 @@ Notes: 'Connecting to remote servers' is not supported by this code. ****************************************************************************/ #ifdef FLM_RING_ZERO_NLM -RCODE FLMAPI F_DirHdl::openDir( +RCODE FTKAPI F_DirHdl::openDir( const char * pszDirName, const char * pszPattern) { @@ -477,7 +477,7 @@ Exit: Desc: Create a directory (and parent directories if necessary). ****************************************************************************/ #if defined( FLM_WIN) || defined( FLM_UNIX) || defined( FLM_LIBC_NLM) -RCODE FLMAPI F_DirHdl::createDir( +RCODE FTKAPI F_DirHdl::createDir( const char * pszDirPath) { RCODE rc = NE_FLM_OK; @@ -557,7 +557,7 @@ Exit: Desc: ****************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI F_DirHdl::createDir( +RCODE FTKAPI F_DirHdl::createDir( const char * pszDirPath) { RCODE rc = NE_FLM_OK; @@ -601,7 +601,7 @@ Exit: Desc: Remove a directory Notes: The directory must be empty. ****************************************************************************/ -RCODE FLMAPI F_DirHdl::removeDir( +RCODE FTKAPI F_DirHdl::removeDir( const char * pszDirName) { #if defined( FLM_WIN) diff --git a/ftk/src/ftkerror.cpp b/ftk/src/ftkerror.cpp index 4369541..658b70e 100644 --- a/ftk/src/ftkerror.cpp +++ b/ftk/src/ftkerror.cpp @@ -31,7 +31,7 @@ Desc: The primary purpose of this function is to provide a way to easily to catch them. ****************************************************************************/ #ifdef FLM_DEBUG -RCODE FLMAPI f_makeErr( +RCODE FTKAPI f_makeErr( RCODE rc, const char *, // pszFile, int, // iLine, @@ -61,7 +61,7 @@ RCODE FLMAPI f_makeErr( Desc: Map POSIX errno to Flaim IO errors. ***************************************************************************/ #if defined( FLM_UNIX) || defined( FLM_LIBC_NLM) -RCODE FLMAPI f_mapPlatformError( +RCODE FTKAPI f_mapPlatformError( FLMINT iError, RCODE defaultRc) { @@ -129,7 +129,7 @@ RCODE FLMAPI f_mapPlatformError( Desc: ***************************************************************************/ #ifdef FLM_RING_ZERO_NLM -RCODE FLMAPI f_mapPlatformError( +RCODE FTKAPI f_mapPlatformError( FLMINT iErrCode, RCODE defaultRc) { @@ -199,7 +199,7 @@ RCODE FLMAPI f_mapPlatformError( Desc: ***************************************************************************/ #ifdef FLM_WIN -RCODE FLMAPI f_mapPlatformError( +RCODE FTKAPI f_mapPlatformError( FLMINT iErrCode, RCODE defaultRc) { @@ -286,7 +286,7 @@ RCODE FLMAPI f_mapPlatformError( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_enterDebugger( +FLMINT FTKAPI f_enterDebugger( const char * pszFile, int iLine) { diff --git a/ftk/src/ftkfsys.cpp b/ftk/src/ftkfsys.cpp index 87b0361..88295db 100644 --- a/ftk/src/ftkfsys.cpp +++ b/ftk/src/ftkfsys.cpp @@ -60,24 +60,24 @@ public: } } - FLMINT FLMAPI AddRef( void) + FLMINT FTKAPI AddRef( void) { return( f_atomicInc( &m_refCnt)); } - FLMINT FLMAPI Release( void); + FLMINT FTKAPI Release( void); - FINLINE const void * FLMAPI getKey( void) + FINLINE const void * FTKAPI getKey( void) { return( m_pucKey); } - FINLINE FLMUINT FLMAPI getKeyLength( void) + FINLINE FLMUINT FTKAPI getKeyLength( void) { return( m_uiKeyLen); } - FINLINE FLMUINT FLMAPI getObjectType( void) + FINLINE FLMUINT FTKAPI getObjectType( void) { return( 0); } @@ -107,7 +107,7 @@ public: FLMUINT uiMaxCachedFiles, FLMUINT uiIdleTimeoutSecs); - FINLINE RCODE FLMAPI openFile( + FINLINE RCODE FTKAPI openFile( const char * pszFileName, FLMUINT uiIoFlags, IF_FileHdl ** ppFile) @@ -115,7 +115,7 @@ public: return( openOrCreate( pszFileName, uiIoFlags, FALSE, ppFile)); } - FINLINE RCODE FLMAPI createFile( + FINLINE RCODE FTKAPI createFile( const char * pszFileName, FLMUINT uiIoFlags, IF_FileHdl ** ppFile) @@ -123,15 +123,15 @@ public: return( openOrCreate( pszFileName, uiIoFlags, TRUE, ppFile)); } - void FLMAPI closeUnusedFiles( + void FTKAPI closeUnusedFiles( FLMUINT uiUnusedTime); - FLMUINT FLMAPI getOpenThreshold( void) + FLMUINT FTKAPI getOpenThreshold( void) { return( m_pAvailList->getMaxObjects()); } - RCODE FLMAPI setOpenThreshold( + RCODE FTKAPI setOpenThreshold( FLMUINT uiMaxOpenFiles); private: @@ -142,7 +142,7 @@ private: FLMBOOL bCreate, IF_FileHdl ** ppFile); - static RCODE FLMAPI timeoutThread( + static RCODE FTKAPI timeoutThread( IF_Thread * pThread); IF_Thread * m_pTimeoutThread; @@ -386,7 +386,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmGetFileSystem( +RCODE FTKAPI FlmGetFileSystem( IF_FileSystem ** ppFileSystem) { *ppFileSystem = f_getFileSysPtr(); @@ -446,7 +446,7 @@ RCODE F_FileSystem::setup( void) /**************************************************************************** Desc: Create a file, return a file handle to created file. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::createFile( +RCODE FTKAPI F_FileSystem::createFile( const char * pszFileName, FLMUINT uiIoFlags, IF_FileHdl ** ppFileHdl) @@ -480,7 +480,7 @@ Exit: /**************************************************************************** Desc: Create a unique file, return a file handle to created file. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::createUniqueFile( +RCODE FTKAPI F_FileSystem::createUniqueFile( char * pszPath, const char * pszFileExtension, FLMUINT uiIoFlags, @@ -516,7 +516,7 @@ Exit: /**************************************************************************** Desc: Open a file, return a file handle to opened file. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::openFile( +RCODE FTKAPI F_FileSystem::openFile( const char * pszFileName, FLMUINT uiIoFlags, IF_FileHdl ** ppFileHdl) @@ -550,7 +550,7 @@ Exit: /**************************************************************************** Desc: Open a directory, return a file handle to opened directory. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::openDir( +RCODE FTKAPI F_FileSystem::openDir( const char * pszDirName, const char * pszPattern, IF_DirHdl ** ppDirHdl) @@ -584,7 +584,7 @@ Exit: /**************************************************************************** Desc: Create a directory. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::createDir( +RCODE FTKAPI F_FileSystem::createDir( const char * pszDirName) { RCODE rc = NE_FLM_OK; @@ -612,7 +612,7 @@ Exit: /**************************************************************************** Desc: Remove a directory ****************************************************************************/ -RCODE FLMAPI F_FileSystem::removeDir( +RCODE FTKAPI F_FileSystem::removeDir( const char * pszDirName, FLMBOOL bClear) { @@ -719,7 +719,7 @@ RCODE F_FileSystem::removeEmptyDir( /**************************************************************************** Desc: Determine if a file or directory exists. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::doesFileExist( +RCODE FTKAPI F_FileSystem::doesFileExist( const char * pszPath) { #if defined( FLM_WIN) @@ -760,7 +760,7 @@ NLM Notes: We have opted to call a higher level function, GetEntryFromPathStringBase, which calls the lower level functions for us. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::getFileTimeStamp( +RCODE FTKAPI F_FileSystem::getFileTimeStamp( const char * pszPath, FLMUINT * puiTimeStamp) { @@ -929,7 +929,7 @@ Exit: /**************************************************************************** Desc: Determine if a path is a directory. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::getFileSize( +RCODE FTKAPI F_FileSystem::getFileSize( const char * pszFileName, FLMUINT64 * pui64FileSize) { @@ -960,7 +960,7 @@ Exit: /**************************************************************************** Desc: Determine if a path is a directory. ****************************************************************************/ -FLMBOOL FLMAPI F_FileSystem::isDir( +FLMBOOL FTKAPI F_FileSystem::isDir( const char * pszDirName) { #if defined( FLM_WIN) @@ -1016,7 +1016,7 @@ FLMBOOL FLMAPI F_FileSystem::isDir( /**************************************************************************** Desc: Delete a file or directory ****************************************************************************/ -RCODE FLMAPI F_FileSystem::deleteFile( +RCODE FTKAPI F_FileSystem::deleteFile( const char * pszFileName) { #if defined( FLM_WIN) @@ -1063,7 +1063,7 @@ RCODE FLMAPI F_FileSystem::deleteFile( /**************************************************************************** Desc: Copy a file. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::copyFile( +RCODE FTKAPI F_FileSystem::copyFile( const char * pszSrcFileName, const char * pszDestFileName, FLMBOOL bOverwrite, @@ -1151,7 +1151,7 @@ Exit: /**************************************************************************** Desc: Do a partial copy from one file into another file. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::copyPartialFile( +RCODE FTKAPI F_FileSystem::copyPartialFile( IF_FileHdl * pSrcFileHdl, FLMUINT64 ui64SrcOffset, FLMUINT64 ui64SrcSize, @@ -1266,7 +1266,7 @@ Exit: /**************************************************************************** Desc: Rename a file. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::renameFile( +RCODE FTKAPI F_FileSystem::renameFile( const char * pszFileName, const char * pszNewFileName) { @@ -1364,7 +1364,7 @@ RCODE FLMAPI F_FileSystem::renameFile( /**************************************************************************** Desc: Get the sector size (not supported on all platforms). ****************************************************************************/ -RCODE FLMAPI F_FileSystem::getSectorSize( +RCODE FTKAPI F_FileSystem::getSectorSize( const char * pszFileName, FLMUINT * puiSectorSize) { @@ -1462,7 +1462,7 @@ Exit: /**************************************************************************** Desc: Set the Read-Only Attribute (not supported on all platforms). ****************************************************************************/ -RCODE FLMAPI F_FileSystem::setReadOnly( +RCODE FTKAPI F_FileSystem::setReadOnly( const char * pszFileName, FLMBOOL bReadOnly) { @@ -1532,7 +1532,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI F_FileSystem::canDoAsync( void) +FLMBOOL FTKAPI F_FileSystem::canDoAsync( void) { return( m_bCanDoAsync); } @@ -1613,7 +1613,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_filecpy( +RCODE FTKAPI f_filecpy( const char * pszSourceFile, const char * pszData) { @@ -1657,7 +1657,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_filecat( +RCODE FTKAPI f_filecat( const char * pszSourceFile, const char * pszData) { @@ -1746,7 +1746,7 @@ Example: pDirPath = "\system" pFileName "autoexec.ncf" ****************************************************************************/ -void FLMAPI F_FileSystem::pathParse( +void FTKAPI F_FileSystem::pathParse( const char * pszInputPath, char * pszServer, char * pszVolume, @@ -1879,7 +1879,7 @@ Desc: This function will strip off the filename or trailing Notes: This function handles drive based, UNC, Netware, and UNIX type paths. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::pathReduce( +RCODE FTKAPI F_FileSystem::pathReduce( const char * pszPath, char * pszDir, char * pszPathComponent) @@ -1986,7 +1986,7 @@ In: *path = pointer to an IO_PATH *string = pointer to a NULL terminated string *end_ptr = pointer to the end of the IO_PATH which is being built. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::pathAppend( +RCODE FTKAPI F_FileSystem::pathAppend( char * pszPath, const char * pszPathComponent) { @@ -2044,7 +2044,7 @@ In: pszPath - the path to convert. pszStorageString - a pointer to a string that is atleast F_PATH_MAX_SIZE in size ****************************************************************************/ -RCODE FLMAPI F_FileSystem::pathToStorageString( +RCODE FTKAPI F_FileSystem::pathToStorageString( const char * pszPath, char * pszStorageString) { @@ -2161,7 +2161,7 @@ In\Out: puiTime -> a modified time stamp which is used as the base counter. Notes: The counter on the collision is 0-9, a-z. ****************************************************************************/ -void FLMAPI F_FileSystem::pathCreateUniqueName( +void FTKAPI F_FileSystem::pathCreateUniqueName( FLMUINT * puiTime, char * pszFileName, const char * pszFileExt, @@ -2217,7 +2217,7 @@ void FLMAPI F_FileSystem::pathCreateUniqueName( /**************************************************************************** Desc: Compares the current file against a pattern template ****************************************************************************/ -FLMBOOL FLMAPI F_FileSystem::doesFileMatch( +FLMBOOL FTKAPI F_FileSystem::doesFileMatch( const char * pszFileName, const char * pszTemplate) { @@ -2280,7 +2280,7 @@ FLMBOOL FLMAPI F_FileSystem::doesFileMatch( /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_FileSystem::deleteMultiFileStream( +RCODE FTKAPI F_FileSystem::deleteMultiFileStream( const char * pszDirectory, const char * pszBaseName) { @@ -2315,7 +2315,7 @@ Desc: This routine obtains exclusive access to a database by creating is open. When the database is finally closed, it deletes the .lck file. This is only used for 3.x databases. ****************************************************************************/ -RCODE FLMAPI F_FileSystem::createLockFile( +RCODE FTKAPI F_FileSystem::createLockFile( const char * pszPath, IF_FileHdl ** ppLockFileHdl) { @@ -2383,7 +2383,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_filetobuf( +RCODE FTKAPI f_filetobuf( const char * pszSourceFile, char ** ppszBuffer) { @@ -2445,7 +2445,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_pathReduce( +RCODE FTKAPI f_pathReduce( const char * pszSourcePath, char * pszDestPath, char * pszString) @@ -2457,7 +2457,7 @@ RCODE FLMAPI f_pathReduce( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_pathAppend( +RCODE FTKAPI f_pathAppend( char * pszPath, const char * pszPathComponent) { @@ -2533,7 +2533,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_FileHdlCache::setOpenThreshold( +RCODE FTKAPI F_FileHdlCache::setOpenThreshold( FLMUINT uiMaxOpenFiles) { return( m_pAvailList->setMaxObjects( uiMaxOpenFiles)); @@ -2617,7 +2617,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_FileHdlCache::closeUnusedFiles( +void FTKAPI F_FileHdlCache::closeUnusedFiles( FLMUINT uiUnusedTime) { if( !uiUnusedTime) @@ -2666,7 +2666,7 @@ RCODE F_FileHdlCache::timeoutThread( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI F_CachedFileHdl::Release( void) +FLMINT FTKAPI F_CachedFileHdl::Release( void) { FLMINT iRefCnt = f_atomicDec( &m_refCnt); F_FileHdlCache * pFileHdlCache = m_pFileHdlCache; @@ -2705,7 +2705,7 @@ FLMINT FLMAPI F_CachedFileHdl::Release( void) /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_FileSystem::allocFileHandleCache( +RCODE FTKAPI F_FileSystem::allocFileHandleCache( FLMUINT uiMaxCachedFiles, FLMUINT uiIdleTimeoutSecs, IF_FileHdlCache ** ppFileHdlCache) @@ -2741,7 +2741,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_FileSystem::allocIOBuffer( +RCODE FTKAPI F_FileSystem::allocIOBuffer( FLMUINT uiMinSize, IF_IOBuffer ** ppIOBuffer) { @@ -2997,7 +2997,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI F_FileAsyncClient::Release( +FLMINT FTKAPI F_FileAsyncClient::Release( FLMBOOL bOkToReuse) { FLMINT iRefCnt; @@ -3157,7 +3157,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_FileAsyncClient::waitToComplete( void) +RCODE FTKAPI F_FileAsyncClient::waitToComplete( void) { RCODE completionRc = NE_FLM_OK; @@ -3238,7 +3238,7 @@ RCODE FLMAPI F_FileAsyncClient::waitToComplete( void) /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_FileAsyncClient::notifyComplete( +void FTKAPI F_FileAsyncClient::notifyComplete( RCODE completionRc, FLMUINT uiBytesDone) { @@ -3287,7 +3287,7 @@ void FLMAPI F_FileAsyncClient::notifyComplete( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_FileAsyncClient::getElapsedTime( void) +FLMUINT FTKAPI F_FileAsyncClient::getElapsedTime( void) { return( FLM_TIMER_UNITS_TO_MILLI( FLM_ELAPSED_TIME( m_uiEndTime, m_uiStartTime))); @@ -3296,7 +3296,7 @@ FLMUINT FLMAPI F_FileAsyncClient::getElapsedTime( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_FileAsyncClient::getCompletionCode( void) +RCODE FTKAPI F_FileAsyncClient::getCompletionCode( void) { return( m_completionRc); } @@ -3736,7 +3736,7 @@ Exit: /**************************************************************************** Desc: Sets current position of file. ****************************************************************************/ -RCODE FLMAPI F_FileHdl::seek( +RCODE FTKAPI F_FileHdl::seek( FLMUINT64 ui64Offset, FLMINT iWhence, FLMUINT64 * pui64NewOffset) @@ -3786,7 +3786,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_FileHdl::tell( +RCODE FTKAPI F_FileHdl::tell( FLMUINT64 * pui64Offset) { *pui64Offset = m_ui64CurrentPos; @@ -3796,7 +3796,7 @@ RCODE FLMAPI F_FileHdl::tell( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_FileHdl::read( +RCODE FTKAPI F_FileHdl::read( FLMUINT64 ui64Offset, FLMUINT uiLength, void * pvBuffer, @@ -3817,7 +3817,7 @@ RCODE FLMAPI F_FileHdl::read( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_FileHdl::read( +RCODE FTKAPI F_FileHdl::read( FLMUINT64 ui64ReadOffset, FLMUINT uiBytesToRead, IF_IOBuffer * pIOBuffer) @@ -3829,7 +3829,7 @@ RCODE FLMAPI F_FileHdl::read( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_FileHdl::write( +RCODE FTKAPI F_FileHdl::write( FLMUINT64 ui64WriteOffset, FLMUINT uiBytesToWrite, const void * pvBuffer, @@ -3850,7 +3850,7 @@ RCODE FLMAPI F_FileHdl::write( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_FileHdl::write( +RCODE FTKAPI F_FileHdl::write( FLMUINT64 ui64WriteOffset, FLMUINT uiBytesToWrite, IF_IOBuffer * pIOBuffer) diff --git a/ftk/src/ftkftx.cpp b/ftk/src/ftkftx.cpp index 4a432fd..04b5d60 100644 --- a/ftk/src/ftkftx.cpp +++ b/ftk/src/ftkftx.cpp @@ -447,17 +447,17 @@ FSTATIC FLMUINT ftxMapFlmColorToWin32( eColorType uiColor); #endif -RCODE FLMAPI _ftxBackgroundThread( +RCODE FTKAPI _ftxBackgroundThread( IF_Thread * pThread); FLMBOOL ftxKBTest( void); FLMUINT ftxKBGetChar( void); -RCODE FLMAPI _ftxDefaultDisplayHandler( +RCODE FTKAPI _ftxDefaultDisplayHandler( IF_Thread * pThread); -RCODE FLMAPI _ftxDefaultKeyboardHandler( +RCODE FTKAPI _ftxDefaultKeyboardHandler( IF_Thread * pThread); #if defined( FLM_UNIX) @@ -522,7 +522,7 @@ static FLMUINT ScanCodeToFKB[] = { /**************************************************************************** Desc: Initializes the FTX environment. ****************************************************************************/ -RCODE FLMAPI FTXInit( +RCODE FTKAPI FTXInit( const char * pszAppName, FLMUINT uiCols, FLMUINT uiRows, @@ -634,7 +634,7 @@ Exit: Desc: Frees all resources allocated to the FTX environment Notes: All screens and windows are freed automatically ****************************************************************************/ -void FLMAPI FTXExit( void) +void FTKAPI FTXExit( void) { FTX_SCREEN * pScreen; @@ -700,7 +700,7 @@ void FLMAPI FTXExit( void) /**************************************************************************** Desc: Refreshes the current screen ****************************************************************************/ -void FLMAPI FTXRefresh( void) +void FTKAPI FTXRefresh( void) { FTX_WINDOW * pWinScreen; @@ -747,7 +747,7 @@ void FLMAPI FTXRefresh( void) /**************************************************************************** Desc: Enables or disables refresh ****************************************************************************/ -void FLMAPI FTXSetRefreshState( +void FTKAPI FTXSetRefreshState( FLMBOOL bDisable) { f_mutexLock( gv_pFtxInfo->hFtxMutex); @@ -758,7 +758,7 @@ void FLMAPI FTXSetRefreshState( /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI FTXRefreshDisabled( void) +FLMBOOL FTKAPI FTXRefreshDisabled( void) { FLMBOOL bDisabled; @@ -772,7 +772,7 @@ FLMBOOL FLMAPI FTXRefreshDisabled( void) /**************************************************************************** Desc: Allows a keyboard handler to add a key to the FTX key buffer ****************************************************************************/ -RCODE FLMAPI FTXAddKey( +RCODE FTKAPI FTXAddKey( FLMUINT uiKey) { RCODE rc = NE_FLM_OK; @@ -830,7 +830,7 @@ Exit: /**************************************************************************** Desc: Cycles to the next screen in the FTX environment ****************************************************************************/ -void FLMAPI FTXCycleScreensNext( void) +void FTKAPI FTXCycleScreensNext( void) { FTX_SCREEN * pScreenTmp; FTX_SCREEN * pScreenLast; @@ -862,7 +862,7 @@ void FLMAPI FTXCycleScreensNext( void) /**************************************************************************** Desc: Cycles to the previous screen in the FTX environment ****************************************************************************/ -void FLMAPI FTXCycleScreensPrev( void) +void FTKAPI FTXCycleScreensPrev( void) { FTX_SCREEN * pScreenPreviousFront; FTX_SCREEN * pScreenLast; @@ -894,7 +894,7 @@ void FLMAPI FTXCycleScreensPrev( void) /**************************************************************************** Desc: Force cursor refresh ****************************************************************************/ -void FLMAPI FTXRefreshCursor( void) +void FTKAPI FTXRefreshCursor( void) { f_mutexLock( gv_pFtxInfo->hFtxMutex); @@ -909,7 +909,7 @@ void FLMAPI FTXRefreshCursor( void) /**************************************************************************** Desc: Invalidates the current screen so that it will be completly redrawn ****************************************************************************/ -void FLMAPI FTXInvalidate( void) +void FTKAPI FTXInvalidate( void) { FTX_WINDOW * pWinScreen; @@ -935,7 +935,7 @@ void FLMAPI FTXInvalidate( void) /**************************************************************************** Desc: Allocates and initializes a new screen object ****************************************************************************/ -RCODE FLMAPI FTXScreenInit( +RCODE FTKAPI FTXScreenInit( const char * pszName, FTX_SCREEN ** ppScreen) { @@ -1034,7 +1034,7 @@ Exit: Desc: Frees all resources allocated to a screen, including all window objects ****************************************************************************/ -void FLMAPI FTXScreenFree( +void FTKAPI FTXScreenFree( FTX_SCREEN ** ppScreen) { FTX_SCREEN * pScreen; @@ -1069,7 +1069,7 @@ Exit: /**************************************************************************** Desc: Makes the passed-in screen the visible screen ****************************************************************************/ -RCODE FLMAPI FTXScreenDisplay( +RCODE FTKAPI FTXScreenDisplay( FTX_SCREEN * pScreen) { RCODE rc = NE_FLM_OK; @@ -1140,7 +1140,7 @@ Exit: /**************************************************************************** Desc: Retrieves the size of the passed-in screen ****************************************************************************/ -RCODE FLMAPI FTXScreenGetSize( +RCODE FTKAPI FTXScreenGetSize( FTX_SCREEN * pScreen, FLMUINT * puiNumCols, FLMUINT * puiNumRows) @@ -1172,7 +1172,7 @@ Exit: /**************************************************************************** Desc: Sets the screen's shutdown flag ****************************************************************************/ -void FLMAPI FTXScreenSetShutdownFlag( +void FTKAPI FTXScreenSetShutdownFlag( FTX_SCREEN * pScreen, FLMBOOL * pbShutdownFlag) { @@ -1191,7 +1191,7 @@ Exit: /**************************************************************************** Desc: Creates a title window and main window (with border) ****************************************************************************/ -RCODE FLMAPI FTXScreenInitStandardWindows( +RCODE FTKAPI FTXScreenInitStandardWindows( FTX_SCREEN * pScreen, eColorType titleBackColor, eColorType titleForeColor, @@ -1281,7 +1281,7 @@ Exit: /**************************************************************************** Desc: Allocates and initializes a window object ****************************************************************************/ -RCODE FLMAPI FTXWinInit( +RCODE FTKAPI FTXWinInit( FTX_SCREEN * pScreen, FLMUINT uiCols, FLMUINT uiRows, @@ -1387,7 +1387,7 @@ Exit: /**************************************************************************** Desc: Frees all resources associated with the passed-in window object ****************************************************************************/ -void FLMAPI FTXWinFree( +void FTKAPI FTXWinFree( FTX_WINDOW ** ppWindow) { FTX_WINDOW * pWindow; @@ -1418,7 +1418,7 @@ Exit: /**************************************************************************** Desc: Opens the specified window and makes it visible ****************************************************************************/ -RCODE FLMAPI FTXWinOpen( +RCODE FTKAPI FTXWinOpen( FTX_WINDOW * pWindow) { RCODE rc = NE_FLM_OK; @@ -1441,7 +1441,7 @@ Exit: /**************************************************************************** Desc: Closes (or hides) the specified window ****************************************************************************/ -void FLMAPI FTXWinClose( +void FTKAPI FTXWinClose( FTX_WINDOW * pWindow) { if( !pWindow) @@ -1466,7 +1466,7 @@ Exit: /**************************************************************************** Desc: Sets the specified window's name ****************************************************************************/ -RCODE FLMAPI FTXWinSetName( +RCODE FTKAPI FTXWinSetName( FTX_WINDOW * pWindow, const char * pszName) { @@ -1491,7 +1491,7 @@ Exit: /**************************************************************************** Desc: Moves the specified window to a new location on the screen ****************************************************************************/ -void FLMAPI FTXWinMove( +void FTKAPI FTXWinMove( FTX_WINDOW * pWindow, FLMUINT uiCol, FLMUINT uiRow) @@ -1528,7 +1528,7 @@ Exit: /**************************************************************************** Desc: Sets the input focus to the specified window ****************************************************************************/ -void FLMAPI FTXWinSetFocus( +void FTKAPI FTXWinSetFocus( FTX_WINDOW * pWindow) { f_mutexLock( pWindow->pScreen->hScreenMutex); @@ -1546,7 +1546,7 @@ void FLMAPI FTXWinSetFocus( Desc: Sets the background color of all characters in the specified window to the same color ****************************************************************************/ -void FLMAPI FTXWinPaintBackground( +void FTKAPI FTXWinPaintBackground( FTX_WINDOW * pWindow, eColorType backgroundColor) { @@ -1570,7 +1570,7 @@ void FLMAPI FTXWinPaintBackground( Desc: Sets the background and/or foreground color of a row in the specified window ****************************************************************************/ -void FLMAPI FTXWinPaintRow( +void FTKAPI FTXWinPaintRow( FTX_WINDOW * pWindow, eColorType * pBackground, eColorType * pForeground, @@ -1606,7 +1606,7 @@ void FLMAPI FTXWinPaintRow( /**************************************************************************** Desc: Sets all of the characters in the window to the specified character ****************************************************************************/ -void FLMAPI FTXWinSetChar( +void FTKAPI FTXWinSetChar( FTX_WINDOW * pWindow, FLMUINT uiChar) { @@ -1630,7 +1630,7 @@ void FLMAPI FTXWinSetChar( /**************************************************************************** Desc: Sets the background color of a row in the specified window. ****************************************************************************/ -void FLMAPI FTXWinPaintRowBackground( +void FTKAPI FTXWinPaintRowBackground( FTX_WINDOW * pWindow, eColorType backgroundColor, FLMUINT uiRow) @@ -1641,7 +1641,7 @@ void FLMAPI FTXWinPaintRowBackground( /**************************************************************************** Desc: Sets the foreground color of all characters in the specified window ****************************************************************************/ -void FLMAPI FTXWinPaintForeground( +void FTKAPI FTXWinPaintForeground( FTX_WINDOW * pWindow, eColorType foregroundColor) { @@ -1664,7 +1664,7 @@ void FLMAPI FTXWinPaintForeground( /**************************************************************************** Desc: Sets the foreground color of a row in the specified window. ****************************************************************************/ -void FLMAPI FTXWinPaintRowForeground( +void FTKAPI FTXWinPaintRowForeground( FTX_WINDOW * pWindow, eColorType foregroundColor, FLMUINT uiRow) @@ -1676,7 +1676,7 @@ void FLMAPI FTXWinPaintRowForeground( Desc: Sets the background and foreground color of the pen associated with the current window ****************************************************************************/ -void FLMAPI FTXWinSetBackFore( +void FTKAPI FTXWinSetBackFore( FTX_WINDOW * pWindow, eColorType backgroundColor, eColorType foregroundColor) @@ -1693,7 +1693,7 @@ void FLMAPI FTXWinSetBackFore( Desc: Retrieves the current background and/or foreground color of the pen associated with the specified window ****************************************************************************/ -void FLMAPI FTXWinGetBackFore( +void FTKAPI FTXWinGetBackFore( FTX_WINDOW * pWindow, eColorType * pBackgroundColor, eColorType * pForegroundColor) @@ -1717,7 +1717,7 @@ void FLMAPI FTXWinGetBackFore( Desc: Prints a character at the current cursor location in the specified window. ****************************************************************************/ -void FLMAPI FTXWinPrintChar( +void FTKAPI FTXWinPrintChar( FTX_WINDOW * pWindow, FLMUINT uiChar) { @@ -1730,7 +1730,7 @@ void FLMAPI FTXWinPrintChar( Desc: Prints a string starting at the current cursor location in the specified window. ****************************************************************************/ -void FLMAPI FTXWinPrintStr( +void FTKAPI FTXWinPrintStr( FTX_WINDOW * pWindow, const char * pszString) { @@ -1761,7 +1761,7 @@ Exit: /**************************************************************************** Desc: Output a formatted string at present cursor location. ****************************************************************************/ -void FLMAPI FTXWinPrintf( +void FTKAPI FTXWinPrintf( FTX_WINDOW * pWindow, const char * pszFormat, ...) { @@ -1777,7 +1777,7 @@ void FLMAPI FTXWinPrintf( /**************************************************************************** Desc: Output a formatted string (with color) at present cursor location. ****************************************************************************/ -void FLMAPI FTXWinCPrintf( +void FTKAPI FTXWinCPrintf( FTX_WINDOW * pWindow, eColorType backgroundColor, eColorType foregroundColor, @@ -1807,7 +1807,7 @@ void FLMAPI FTXWinCPrintf( /**************************************************************************** Desc: Prints a string at a specific offset in the specified window. ****************************************************************************/ -void FLMAPI FTXWinPrintStrXY( +void FTKAPI FTXWinPrintStrXY( FTX_WINDOW * pWindow, const char * pszString, FLMUINT uiCol, @@ -1820,7 +1820,7 @@ void FLMAPI FTXWinPrintStrXY( /**************************************************************************** Desc: Sets the cursor position in the specified window ****************************************************************************/ -void FLMAPI FTXWinSetCursorPos( +void FTKAPI FTXWinSetCursorPos( FTX_WINDOW * pWindow, FLMUINT uiCol, FLMUINT uiRow) @@ -1833,7 +1833,7 @@ void FLMAPI FTXWinSetCursorPos( /**************************************************************************** Desc: Enables or disables scrolling in the specified window ****************************************************************************/ -void FLMAPI FTXWinSetScroll( +void FTKAPI FTXWinSetScroll( FTX_WINDOW * pWindow, FLMBOOL bScroll) { @@ -1857,7 +1857,7 @@ Exit: /**************************************************************************** Desc: Enables or disables line wrap ****************************************************************************/ -void FLMAPI FTXWinSetLineWrap( +void FTKAPI FTXWinSetLineWrap( FTX_WINDOW * pWindow, FLMBOOL bLineWrap) { @@ -1881,7 +1881,7 @@ Exit: /**************************************************************************** Desc: Retrieves the scroll flag for the specified window ****************************************************************************/ -void FLMAPI FTXWinGetScroll( +void FTKAPI FTXWinGetScroll( FTX_WINDOW * pWindow, FLMBOOL * pbScroll) { @@ -1905,7 +1905,7 @@ Exit: /**************************************************************************** Desc: Retrieves the screen of the current window ****************************************************************************/ -RCODE FLMAPI FTXWinGetScreen( +RCODE FTKAPI FTXWinGetScreen( FTX_WINDOW * pWindow, FTX_SCREEN ** ppScreen) { @@ -1935,7 +1935,7 @@ Exit: /**************************************************************************** Desc: Retrieves the windows position on the screen ****************************************************************************/ -RCODE FLMAPI FTXWinGetPosition( +RCODE FTKAPI FTXWinGetPosition( FTX_WINDOW * pWindow, FLMUINT * puiCol, FLMUINT * puiRow) @@ -1973,7 +1973,7 @@ Exit: Desc: Clears from the specified column and row to the end of the row in the specified window ****************************************************************************/ -void FLMAPI FTXWinClearLine( +void FTKAPI FTXWinClearLine( FTX_WINDOW * pWindow, FLMUINT uiCol, FLMUINT uiRow) @@ -1987,7 +1987,7 @@ void FLMAPI FTXWinClearLine( Desc: Clears from the current cursor position to the end of the current line ****************************************************************************/ -void FLMAPI FTXWinClearToEOL( +void FTKAPI FTXWinClearToEOL( FTX_WINDOW * pWindow) { f_mutexLock( pWindow->pScreen->hScreenMutex); @@ -2001,7 +2001,7 @@ void FLMAPI FTXWinClearToEOL( Desc: Clears the canvas of the specified window starting at the requested row and column offset ****************************************************************************/ -void FLMAPI FTXWinClearXY( +void FTKAPI FTXWinClearXY( FTX_WINDOW * pWindow, FLMUINT uiCol, FLMUINT uiRow) @@ -2033,7 +2033,7 @@ void FLMAPI FTXWinClearXY( /**************************************************************************** Desc: Clears the canvas area of the specified window ****************************************************************************/ -void FLMAPI FTXWinClear( +void FTKAPI FTXWinClear( FTX_WINDOW * pWindow) { FTXWinClearXY( pWindow, 0, 0); @@ -2043,7 +2043,7 @@ void FLMAPI FTXWinClear( /**************************************************************************** Desc: Draws a border around the canvas area of the specified window ****************************************************************************/ -void FLMAPI FTXWinDrawBorder( +void FTKAPI FTXWinDrawBorder( FTX_WINDOW * pWindow) { FLMUINT uiLoop; @@ -2144,7 +2144,7 @@ void FLMAPI FTXWinDrawBorder( /**************************************************************************** Desc: Draws a border around the canvas area of the specified window ****************************************************************************/ -void FLMAPI FTXWinSetTitle( +void FTKAPI FTXWinSetTitle( FTX_WINDOW * pWindow, const char * pszTitle, eColorType backgroundColor, @@ -2206,7 +2206,7 @@ void FLMAPI FTXWinSetTitle( /**************************************************************************** Desc: Draws a border around the canvas area of the specified window ****************************************************************************/ -void FLMAPI FTXWinSetHelp( +void FTKAPI FTXWinSetHelp( FTX_WINDOW * pWindow, const char * pszHelp, eColorType backgroundColor, @@ -2268,7 +2268,7 @@ void FLMAPI FTXWinSetHelp( /**************************************************************************** Desc: Tests the key buffer for an available key ****************************************************************************/ -RCODE FLMAPI FTXWinTestKB( +RCODE FTKAPI FTXWinTestKB( FTX_WINDOW * pWindow) { RCODE rc = NE_FLM_OK; @@ -2297,7 +2297,7 @@ Exit: /**************************************************************************** Desc: Gets a character from the keyboard ****************************************************************************/ -RCODE FLMAPI FTXWinInputChar( +RCODE FTKAPI FTXWinInputChar( FTX_WINDOW * pWindow, FLMUINT * puiChar) { @@ -2376,7 +2376,7 @@ Exit: /**************************************************************************** Desc: Line editor routine ****************************************************************************/ -RCODE FLMAPI FTXLineEdit( +RCODE FTKAPI FTXLineEdit( FTX_WINDOW * pWindow, char * pszBuffer, FLMUINT uiBufSize, @@ -2800,7 +2800,7 @@ Exit: /**************************************************************************** Desc: Line editor routine which assumes some defaults ****************************************************************************/ -FLMUINT FLMAPI FTXLineEd( +FLMUINT FTKAPI FTXLineEd( FTX_WINDOW * pWindow, char * pszBuffer, FLMUINT uiBufSize) @@ -2865,7 +2865,7 @@ Exit: /**************************************************************************** Desc: Displays a message window *****************************************************************************/ -RCODE FLMAPI FTXMessageWindow( +RCODE FTKAPI FTXMessageWindow( FTX_SCREEN * pScreen, eColorType backgroundColor, eColorType foregroundColor, @@ -2952,7 +2952,7 @@ Exit: /**************************************************************************** Desc: Displays a dialog-style message box *****************************************************************************/ -RCODE FLMAPI FTXDisplayMessage( +RCODE FTKAPI FTXDisplayMessage( FTX_SCREEN * pScreen, eColorType backgroundColor, eColorType foregroundColor, @@ -3017,7 +3017,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI FTXGetInput( +RCODE FTKAPI FTXGetInput( FTX_SCREEN * pScreen, const char * pszMessage, char * pszResponse, @@ -3078,7 +3078,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI FTXWinGetCanvasSize( +void FTKAPI FTXWinGetCanvasSize( FTX_WINDOW * pWindow, FLMUINT * puiNumCols, FLMUINT * puiNumRows) @@ -3099,7 +3099,7 @@ void FLMAPI FTXWinGetCanvasSize( Desc: Sets or changes the appearance of the cursor in the specified window. ****************************************************************************/ -void FLMAPI FTXWinSetCursorType( +void FTKAPI FTXWinSetCursorType( FTX_WINDOW * pWindow, FLMUINT uiType) { @@ -3112,7 +3112,7 @@ void FLMAPI FTXWinSetCursorType( /**************************************************************************** Desc: Retrieves the cursor type of the specified window ****************************************************************************/ -FLMUINT FLMAPI FTXWinGetCursorType( +FLMUINT FTKAPI FTXWinGetCursorType( FTX_WINDOW * pWindow) { return( pWindow->uiCursorType); @@ -3121,7 +3121,7 @@ FLMUINT FLMAPI FTXWinGetCursorType( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI FTXSetShutdownFlag( +void FTKAPI FTXSetShutdownFlag( FLMBOOL * pbShutdownFlag) { f_mutexLock( gv_pFtxInfo->hFtxMutex); @@ -3132,7 +3132,7 @@ void FLMAPI FTXSetShutdownFlag( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI FTXWinGetSize( +void FTKAPI FTXWinGetSize( FTX_WINDOW * pWindow, FLMUINT * puiNumCols, FLMUINT * puiNumRows) @@ -3151,7 +3151,7 @@ void FLMAPI FTXWinGetSize( /**************************************************************************** Desc: Retrieves the current cursor row in the specified window ****************************************************************************/ -FLMUINT FLMAPI FTXWinGetCurrRow( +FLMUINT FTKAPI FTXWinGetCurrRow( FTX_WINDOW * pWindow) { return( (FLMUINT)(pWindow->uiCurY - pWindow->uiOffset)); @@ -3160,7 +3160,7 @@ FLMUINT FLMAPI FTXWinGetCurrRow( /**************************************************************************** Desc: Retrieves the current cursor column in the specified window ****************************************************************************/ -FLMUINT FLMAPI FTXWinGetCurrCol( +FLMUINT FTKAPI FTXWinGetCurrCol( FTX_WINDOW * pWindow) { return( (FLMUINT)(pWindow->uiCurX - pWindow->uiOffset)); @@ -3169,7 +3169,7 @@ FLMUINT FLMAPI FTXWinGetCurrCol( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI FTXWinGetCursorPos( +void FTKAPI FTXWinGetCursorPos( FTX_WINDOW * pWindow, FLMUINT * puiCol, FLMUINT * puiRow) @@ -4642,7 +4642,7 @@ Exit: Desc: Causes the console to "beep" Ret: If the console does not support this feature, FALSE is returned. ****************************************************************************/ -void FLMAPI FTXBeep( void) +void FTKAPI FTXBeep( void) { #if defined( FLM_WIN) @@ -4819,7 +4819,7 @@ FSTATIC ftxWin32CharPair * ftxWin32GetExtendedKeycode( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI _ftxDefaultDisplayHandler( +RCODE FTKAPI _ftxDefaultDisplayHandler( IF_Thread * pThread) { #if defined( FLM_WIN) @@ -4864,7 +4864,7 @@ RCODE FLMAPI _ftxDefaultDisplayHandler( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI _ftxDefaultKeyboardHandler( +RCODE FTKAPI _ftxDefaultKeyboardHandler( IF_Thread * pThread) { FLMUINT uiChar; @@ -4967,7 +4967,7 @@ RCODE FLMAPI _ftxDefaultKeyboardHandler( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI _ftxBackgroundThread( +RCODE FTKAPI _ftxBackgroundThread( IF_Thread * pThread) { for( ;;) @@ -5012,7 +5012,7 @@ RCODE FLMAPI _ftxBackgroundThread( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FTXDisplayScrollWindow( +RCODE FTKAPI FTXDisplayScrollWindow( FTX_SCREEN * pScreen, const char * pszTitle, const char * pszMessage, @@ -5871,7 +5871,7 @@ FSTATIC FLMBOOL ftxUnixKBTest( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_conInit( +RCODE FTKAPI f_conInit( FLMUINT uiRows, FLMUINT uiCols, const char * pszTitle) @@ -5923,7 +5923,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_conExit( void) +void FTKAPI f_conExit( void) { if( !gv_conInitCount || f_atomicDec( &gv_conInitCount) > 0) { @@ -5951,7 +5951,7 @@ void FLMAPI f_conExit( void) /**************************************************************************** Desc: Returns the size of the screen in columns and rows. ****************************************************************************/ -void FLMAPI f_conGetScreenSize( +void FTKAPI f_conGetScreenSize( FLMUINT * puiNumColsRV, FLMUINT * puiNumRowsRV) { @@ -5963,7 +5963,7 @@ void FLMAPI f_conGetScreenSize( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_conStrOut( +void FTKAPI f_conStrOut( const char * pszString) { f_mutexLock( gv_hConMutex); @@ -5974,7 +5974,7 @@ void FLMAPI f_conStrOut( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_conStrOutXY( +void FTKAPI f_conStrOutXY( const char * pszString, FLMUINT uiCol, FLMUINT uiRow) @@ -5987,7 +5987,7 @@ void FLMAPI f_conStrOutXY( /**************************************************************************** Desc: Output a formatted string at present cursor location. ****************************************************************************/ -void FLMAPI f_conPrintf( +void FTKAPI f_conPrintf( const char * pszFormat, ...) { char szBuffer[ 512]; @@ -6005,7 +6005,7 @@ void FLMAPI f_conPrintf( /**************************************************************************** Desc: Output a formatted string at present cursor location with color ****************************************************************************/ -void FLMAPI f_conCPrintf( +void FTKAPI f_conCPrintf( eColorType back, eColorType fore, const char * pszFormat, ...) @@ -6030,7 +6030,7 @@ void FLMAPI f_conCPrintf( /**************************************************************************** Desc: Clear the screen from the col/row down ****************************************************************************/ -void FLMAPI f_conClearScreen( +void FTKAPI f_conClearScreen( FLMUINT uiCol, FLMUINT uiRow) { @@ -6061,7 +6061,7 @@ void FLMAPI f_conClearScreen( Desc: Position to the column and row specified. Notes: The NLM could call GetPositionOfOutputCursor(&r,&c); ****************************************************************************/ -void FLMAPI f_conSetCursorPos( +void FTKAPI f_conSetCursorPos( FLMUINT uiCol, FLMUINT uiRow) { @@ -6090,7 +6090,7 @@ void FLMAPI f_conSetCursorPos( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_conClearLine( +void FTKAPI f_conClearLine( FLMUINT uiCol, FLMUINT uiRow) { @@ -6119,7 +6119,7 @@ void FLMAPI f_conClearLine( /**************************************************************************** Desc: Edit a line of data like gets(s). Newline replaced by NULL character. ****************************************************************************/ -FLMUINT FLMAPI f_conLineEdit( +FLMUINT FTKAPI f_conLineEdit( char * pszString, FLMUINT uiMaxLen) { @@ -6141,7 +6141,7 @@ FLMUINT FLMAPI f_conLineEdit( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_conSetShutdown( +void FTKAPI f_conSetShutdown( FLMBOOL * pbShutdown) { FTXSetShutdownFlag( pbShutdown); @@ -6151,7 +6151,7 @@ void FLMAPI f_conSetShutdown( Desc: Edit a line of data with advanced features. Ret: Number of characters input. ****************************************************************************/ -FLMUINT FLMAPI f_conLineEditExt( +FLMUINT FTKAPI f_conLineEditExt( char * pszBuffer, FLMUINT uiBufSize, FLMUINT uiMaxWidth, @@ -6175,7 +6175,7 @@ FLMUINT FLMAPI f_conLineEditExt( /**************************************************************************** Desc: Get the current X coordinate of the cursor ****************************************************************************/ -FLMUINT FLMAPI f_conGetCursorColumn( void) +FLMUINT FTKAPI f_conGetCursorColumn( void) { FLMUINT uiCol; @@ -6189,7 +6189,7 @@ FLMUINT FLMAPI f_conGetCursorColumn( void) /**************************************************************************** Desc: Get the current Y coordinate of the cursor ****************************************************************************/ -FLMUINT FLMAPI f_conGetCursorRow( void) +FLMUINT FTKAPI f_conGetCursorRow( void) { FLMUINT uiRow; @@ -6203,7 +6203,7 @@ FLMUINT FLMAPI f_conGetCursorRow( void) /**************************************************************************** Desc: Set the background and foreground colors ****************************************************************************/ -void FLMAPI f_conSetBackFore( +void FTKAPI f_conSetBackFore( eColorType backColor, eColorType foreColor) { @@ -6215,7 +6215,7 @@ void FLMAPI f_conSetBackFore( /**************************************************************************** Desc : Sets the cursor attributes. ****************************************************************************/ -void FLMAPI f_conSetCursorType( +void FTKAPI f_conSetCursorType( FLMUINT uiType) { f_mutexLock( gv_hConMutex); @@ -6226,7 +6226,7 @@ void FLMAPI f_conSetCursorType( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_conDrawBorder( void) +void FTKAPI f_conDrawBorder( void) { f_mutexLock( gv_hConMutex); FTXWinDrawBorder( gv_pConWindow); @@ -6236,7 +6236,7 @@ void FLMAPI f_conDrawBorder( void) /**************************************************************************** Desc: Not*************************************************************************/ -FLMUINT FLMAPI f_conGetKey( void) +FLMUINT FTKAPI f_conGetKey( void) { FLMUINT uiChar; @@ -6250,7 +6250,7 @@ FLMUINT FLMAPI f_conGetKey( void) /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI f_conHaveKey( void) +FLMBOOL FTKAPI f_conHaveKey( void) { FLMBOOL bHaveKey; diff --git a/ftk/src/ftkhttp.cpp b/ftk/src/ftkhttp.cpp index d5dabbc..d54b859 100644 --- a/ftk/src/ftkhttp.cpp +++ b/ftk/src/ftkhttp.cpp @@ -30,7 +30,7 @@ Desc: ****************************************************************************/ class F_HTTPKeyCompare : public IF_ResultSetCompare { - RCODE FLMAPI compare( + RCODE FTKAPI compare( const void * pvData1, FLMUINT uiLength1, const void * pvData2, @@ -85,50 +85,50 @@ public: resetHeader(); } - RCODE FLMAPI readRequestHeader( + RCODE FTKAPI readRequestHeader( IF_IStream * pIStream); - RCODE FLMAPI readResponseHeader( + RCODE FTKAPI readResponseHeader( IF_IStream * pIStream); - RCODE FLMAPI writeRequestHeader( + RCODE FTKAPI writeRequestHeader( IF_OStream * pOStream); - RCODE FLMAPI writeResponseHeader( + RCODE FTKAPI writeResponseHeader( IF_OStream * pOStream); - RCODE FLMAPI getHeaderValue( + RCODE FTKAPI getHeaderValue( const char * pszTag, F_DynaBuf * pBuffer); - RCODE FLMAPI setHeaderValue( + RCODE FTKAPI setHeaderValue( const char * pszTag, const char * pszValue); - RCODE FLMAPI getHeaderValue( + RCODE FTKAPI getHeaderValue( const char * pszTag, FLMUINT * puiValue); - RCODE FLMAPI setHeaderValue( + RCODE FTKAPI setHeaderValue( const char * pszTag, FLMUINT uiValue); - RCODE FLMAPI setMethod( + RCODE FTKAPI setMethod( eHttpMethod httpMethod); eHttpMethod getMethod( void); - FLMUINT FLMAPI getStatusCode( void); + FLMUINT FTKAPI getStatusCode( void); - RCODE FLMAPI setStatusCode( + RCODE FTKAPI setStatusCode( FLMUINT uiStatusCode); - RCODE FLMAPI setRequestURI( + RCODE FTKAPI setRequestURI( const char * pszRequestURI); - const char * FLMAPI getRequestURI( void); + const char * FTKAPI getRequestURI( void); - void FLMAPI resetHeader( void); + void FTKAPI resetHeader( void); private: @@ -151,7 +151,7 @@ private: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmAllocHTTPHeader( +RCODE FTKAPI FlmAllocHTTPHeader( IF_HTTPHeader ** ppHTTPHeader) { if( (*ppHTTPHeader = f_new F_HTTPHeader) == NULL) @@ -248,7 +248,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HTTPHeader::readResponseHeader( +RCODE FTKAPI F_HTTPHeader::readResponseHeader( IF_IStream * pIStream) { RCODE rc = NE_FLM_OK; @@ -363,7 +363,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HTTPHeader::readRequestHeader( +RCODE FTKAPI F_HTTPHeader::readRequestHeader( IF_IStream * pIStream) { RCODE rc = NE_FLM_OK; @@ -480,7 +480,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HTTPHeader::getHeaderValue( +RCODE FTKAPI F_HTTPHeader::getHeaderValue( const char * pszTag, F_DynaBuf * pBuffer) { @@ -525,7 +525,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HTTPHeader::setHeaderValue( +RCODE FTKAPI F_HTTPHeader::setHeaderValue( const char * pszTag, const char * pszValue) { @@ -572,7 +572,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HTTPHeader::getHeaderValue( +RCODE FTKAPI F_HTTPHeader::getHeaderValue( const char * pszTag, FLMUINT * puiValue) { @@ -594,7 +594,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HTTPHeader::setHeaderValue( +RCODE FTKAPI F_HTTPHeader::setHeaderValue( const char * pszTag, FLMUINT uiValue) { @@ -616,7 +616,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_HTTPHeader::getStatusCode( void) +FLMUINT FTKAPI F_HTTPHeader::getStatusCode( void) { return( m_uiStatusCode); } @@ -624,7 +624,7 @@ FLMUINT FLMAPI F_HTTPHeader::getStatusCode( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HTTPHeader::setStatusCode( +RCODE FTKAPI F_HTTPHeader::setStatusCode( FLMUINT uiStatusCode) { m_uiStatusCode = uiStatusCode; @@ -634,7 +634,7 @@ RCODE FLMAPI F_HTTPHeader::setStatusCode( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HTTPHeader::setMethod( +RCODE FTKAPI F_HTTPHeader::setMethod( eHttpMethod httpMethod) { m_httpMethod = httpMethod; @@ -652,7 +652,7 @@ eHttpMethod F_HTTPHeader::getMethod( void) /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_HTTPHeader::resetHeader( void) +void FTKAPI F_HTTPHeader::resetHeader( void) { if( m_pResultSet) { @@ -674,7 +674,7 @@ void FLMAPI F_HTTPHeader::resetHeader( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HTTPHeader::setRequestURI( +RCODE FTKAPI F_HTTPHeader::setRequestURI( const char * pszRequestURI) { RCODE rc = NE_FLM_OK; @@ -700,7 +700,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HTTPHeader::writeRequestHeader( +RCODE FTKAPI F_HTTPHeader::writeRequestHeader( IF_OStream * pOStream) { RCODE rc = NE_FLM_OK; @@ -750,7 +750,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HTTPHeader::writeResponseHeader( +RCODE FTKAPI F_HTTPHeader::writeResponseHeader( IF_OStream * pOStream) { RCODE rc = NE_FLM_OK; @@ -849,7 +849,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -const char * FLMAPI FlmGetHTTPStatusString( +const char * FTKAPI FlmGetHTTPStatusString( FLMUINT uiStatusCode) { const char * pszStatusCode; diff --git a/ftk/src/ftkini.cpp b/ftk/src/ftkini.cpp index e7c4cd9..effb161 100644 --- a/ftk/src/ftkini.cpp +++ b/ftk/src/ftkini.cpp @@ -50,36 +50,36 @@ public: void init( void); - RCODE FLMAPI read( + RCODE FTKAPI read( const char * pszFileName); - RCODE FLMAPI write( void); + RCODE FTKAPI write( void); - FLMBOOL FLMAPI getParam( + FLMBOOL FTKAPI getParam( const char * pszParamName, FLMUINT * puiParamVal); - FLMBOOL FLMAPI getParam( + FLMBOOL FTKAPI getParam( const char * pszParamName, FLMBOOL * pbParamVal); - FLMBOOL FLMAPI getParam( + FLMBOOL FTKAPI getParam( const char * pszParamName, char ** ppszParamVal); - RCODE FLMAPI setParam( + RCODE FTKAPI setParam( const char * pszParamName, FLMUINT uiParamVal); - RCODE FLMAPI setParam( + RCODE FTKAPI setParam( const char * pszParamName, FLMBOOL bParamVal); - RCODE FLMAPI setParam( + RCODE FTKAPI setParam( const char * pszParamName, const char * pszParamVal); - FINLINE FLMBOOL FLMAPI testParam( + FINLINE FLMBOOL FTKAPI testParam( const char * pszParamName) { if( findParam( pszParamName)) @@ -179,7 +179,7 @@ F_IniFile::~F_IniFile() /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocIniFile( +RCODE FTKAPI FlmAllocIniFile( IF_IniFile ** ppIniFile) { RCODE rc = NE_FLM_OK; @@ -221,7 +221,7 @@ void F_IniFile::init( void) /**************************************************************************** Desc: Read the ini file and parse its contents ****************************************************************************/ -RCODE FLMAPI F_IniFile::read( +RCODE FTKAPI F_IniFile::read( const char * pszFileName) { RCODE rc = NE_FLM_OK; @@ -360,7 +360,7 @@ Exit: /**************************************************************************** Desc: Copies the data stored in the INI_LINE structs to the ini file ****************************************************************************/ -RCODE FLMAPI F_IniFile::write( void) +RCODE FTKAPI F_IniFile::write( void) { RCODE rc = NE_FLM_OK; FLMUINT uiBytesWritten; @@ -489,7 +489,7 @@ Exit: Desc: Retrieves the value associated with the specified name from the list of INI_STRUCTs ****************************************************************************/ -FLMBOOL FLMAPI F_IniFile::getParam( +FLMBOOL FTKAPI F_IniFile::getParam( const char * pszParamName, FLMUINT * puiParamVal) { @@ -521,7 +521,7 @@ Exit: Desc: Stores a new value for the specified name (or creates a new name/value pair) in the list of INI_STRUCTs ****************************************************************************/ -RCODE FLMAPI F_IniFile::setParam( +RCODE FTKAPI F_IniFile::setParam( const char * pszParamName, FLMUINT uiParamVal) { @@ -556,7 +556,7 @@ Exit: Desc: Retrieves the value associated with the specified name from the list of INI_STRUCTs ****************************************************************************/ -FLMBOOL FLMAPI F_IniFile::getParam( +FLMBOOL FTKAPI F_IniFile::getParam( const char * pszParamName, FLMBOOL * pbParamVal) // Out: The value associated with name { @@ -589,7 +589,7 @@ Exit: Desc: Stores a new value for the specified name (or creates a new name/value pair) in the list of INI_STRUCTs ****************************************************************************/ -RCODE FLMAPI F_IniFile::setParam( +RCODE FTKAPI F_IniFile::setParam( const char * pszParamName, FLMBOOL bParamVal) { @@ -624,7 +624,7 @@ Exit: Desc: Retrieves the value associated with the specified name from the list of INI_STRUCTs ****************************************************************************/ -FLMBOOL FLMAPI F_IniFile::getParam( +FLMBOOL FTKAPI F_IniFile::getParam( const char * pszParamName, char ** ppszParamVal) { @@ -658,7 +658,7 @@ Exit: Desc: Stores a new value for the specified name (or creates a new name/value pair) in the list of INI_STRUCTs ****************************************************************************/ -RCODE FLMAPI F_IniFile::setParam( +RCODE FTKAPI F_IniFile::setParam( const char * pszParamName, const char * pszParamVal) { diff --git a/ftk/src/ftkiobuf.cpp b/ftk/src/ftkiobuf.cpp index d9cc9e9..e70cbbd 100644 --- a/ftk/src/ftkiobuf.cpp +++ b/ftk/src/ftkiobuf.cpp @@ -41,13 +41,13 @@ public: FLMUINT uiMaxBytes, FLMBOOL bReuseBuffers); - RCODE FLMAPI getBuffer( + RCODE FTKAPI getBuffer( FLMUINT uiBufferSize, IF_IOBuffer ** ppIOBuffer); - RCODE FLMAPI waitForAllPendingIO( void); + RCODE FTKAPI waitForAllPendingIO( void); - FINLINE FLMBOOL FLMAPI isIOPending( void) + FINLINE FLMBOOL FTKAPI isIOPending( void) { return( m_pFirstPending ? TRUE : FALSE); } @@ -82,7 +82,7 @@ private: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocIOBufferMgr( +RCODE FTKAPI FlmAllocIOBufferMgr( FLMUINT uiMaxBuffers, FLMUINT uiMaxBytes, FLMBOOL bReuseBuffers, @@ -205,7 +205,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_IOBufferMgr::getBuffer( +RCODE FTKAPI F_IOBufferMgr::getBuffer( FLMUINT uiBufferSize, IF_IOBuffer ** ppIOBuffer) { @@ -316,7 +316,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_IOBufferMgr::waitForAllPendingIO( void) +RCODE FTKAPI F_IOBufferMgr::waitForAllPendingIO( void) { RCODE rc = NE_FLM_OK; RCODE tmpRc; @@ -531,7 +531,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_IOBuffer::setPending( void) +void FTKAPI F_IOBuffer::setPending( void) { f_assert( !m_bPending); @@ -558,7 +558,7 @@ void FLMAPI F_IOBuffer::setPending( void) /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_IOBuffer::clearPending( void) +void FTKAPI F_IOBuffer::clearPending( void) { f_assert( m_bPending); @@ -618,7 +618,7 @@ void F_IOBuffer::notifyComplete( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_IOBuffer::addCallbackData( +RCODE FTKAPI F_IOBuffer::addCallbackData( void * pvData) { RCODE rc = NE_FLM_OK; @@ -662,7 +662,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void * FLMAPI F_IOBuffer::getCallbackData( +void * FTKAPI F_IOBuffer::getCallbackData( FLMUINT uiSlot) { if( uiSlot < m_uiCallbackDataCount) diff --git a/ftk/src/ftklock.cpp b/ftk/src/ftklock.cpp index 3f5ebf6..b30a6d5 100644 --- a/ftk/src/ftklock.cpp +++ b/ftk/src/ftklock.cpp @@ -56,33 +56,33 @@ public: virtual ~F_LockObject(); - FLMINT FLMAPI AddRef( void); + FLMINT FTKAPI AddRef( void); - FLMINT FLMAPI Release( void); + FLMINT FTKAPI Release( void); RCODE setupLockObject( void); - RCODE FLMAPI lock( + RCODE FTKAPI lock( F_SEM hWaitSem, FLMBOOL bExclLock, FLMUINT uiMaxWaitSecs, FLMINT iPriority, F_LOCK_STATS * pLockStats = NULL); - RCODE FLMAPI unlock( + RCODE FTKAPI unlock( F_LOCK_STATS * pLockStats = NULL); - FLMUINT FLMAPI getLockCount( void) + FLMUINT FTKAPI getLockCount( void) { return( m_uiLockCount); } - FLMUINT FLMAPI getWaiterCount( void) + FLMUINT FTKAPI getWaiterCount( void) { return( m_uiNumWaiters); } - RCODE FLMAPI getLockInfo( + RCODE FTKAPI getLockInfo( FLMINT iPriority, eLockType * peCurrLockType, FLMUINT * puiThreadId, @@ -91,25 +91,25 @@ public: FLMUINT * puiNumSharedQueued, FLMUINT * puiPriorityCount); - RCODE FLMAPI getLockInfo( + RCODE FTKAPI getLockInfo( IF_LockInfoClient * pLockInfo); - RCODE FLMAPI getLockQueue( + RCODE FTKAPI getLockQueue( F_LOCK_USER ** ppLockUsers); - FLMBOOL FLMAPI haveHigherPriorityWaiter( + FLMBOOL FTKAPI haveHigherPriorityWaiter( FLMINT iPriority); - void FLMAPI timeoutLockWaiter( + void FTKAPI timeoutLockWaiter( FLMUINT uiThreadId); - void FLMAPI timeoutAllWaiters( void); + void FTKAPI timeoutAllWaiters( void); private: void cleanupLockObject( void); - static RCODE FLMAPI timeoutThread( + static RCODE FTKAPI timeoutThread( IF_Thread * pThread); void insertWaiter( @@ -137,7 +137,7 @@ private: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocLockObject( +RCODE FTKAPI FlmAllocLockObject( IF_LockObject ** ppLockObject) { RCODE rc = NE_FLM_OK; @@ -215,7 +215,7 @@ void F_LockObject::cleanupLockObject( void) /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI F_LockObject::AddRef( void) +FLMINT FTKAPI F_LockObject::AddRef( void) { return( f_atomicInc( &m_refCnt)); } @@ -223,7 +223,7 @@ FLMINT FLMAPI F_LockObject::AddRef( void) /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI F_LockObject::Release( void) +FLMINT FTKAPI F_LockObject::Release( void) { FLMINT iRefCnt = f_atomicDec( &m_refCnt); @@ -267,7 +267,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_LockObject::timeoutThread( +RCODE FTKAPI F_LockObject::timeoutThread( IF_Thread * pThread) { RCODE rc = NE_FLM_OK; @@ -327,7 +327,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_LockObject::timeoutLockWaiter( +void FTKAPI F_LockObject::timeoutLockWaiter( FLMUINT uiThreadId) { FLMUINT uiCurrTime; @@ -364,7 +364,7 @@ void FLMAPI F_LockObject::timeoutLockWaiter( Desc: Inserts a waiter into the global list of waiters, sorted by its end wait time. ****************************************************************************/ -void FLMAPI F_LockObject::timeoutAllWaiters( void) +void FTKAPI F_LockObject::timeoutAllWaiters( void) { F_LOCK_WAITER * pLockWaiter; @@ -550,7 +550,7 @@ void F_LockObject::removeWaiter( Desc: Lock this object. If object is locked, wait the specified number of seconds. ****************************************************************************/ -RCODE FLMAPI F_LockObject::lock( +RCODE FTKAPI F_LockObject::lock( F_SEM hWaitSem, FLMBOOL bExclReq, FLMUINT uiMaxWaitSecs, @@ -694,7 +694,7 @@ Exit: Desc: Unlock this object. If there is a pending lock request, give the lock to the next waiter. ****************************************************************************/ -RCODE FLMAPI F_LockObject::unlock( +RCODE FTKAPI F_LockObject::unlock( F_LOCK_STATS * pLockStats) { RCODE rc = NE_FLM_OK; @@ -814,7 +814,7 @@ RCODE FLMAPI F_LockObject::unlock( /**************************************************************************** Desc: Returns information about the pending lock requests. ****************************************************************************/ -RCODE FLMAPI F_LockObject::getLockInfo( +RCODE FTKAPI F_LockObject::getLockInfo( FLMINT iPriority, eLockType * peCurrLockType, FLMUINT * puiThreadId, @@ -930,7 +930,7 @@ RCODE FLMAPI F_LockObject::getLockInfo( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_LockObject::getLockInfo( +RCODE FTKAPI F_LockObject::getLockInfo( IF_LockInfoClient * pLockInfo) { RCODE rc = NE_FLM_OK; @@ -997,7 +997,7 @@ Exit: Desc: Return a list that includes the current lock holder as well as the lock waiters. ****************************************************************************/ -RCODE FLMAPI F_LockObject::getLockQueue( +RCODE FTKAPI F_LockObject::getLockQueue( F_LOCK_USER ** ppLockUsers) { RCODE rc = NE_FLM_OK; @@ -1062,7 +1062,7 @@ Exit: /**************************************************************************** Desc: Returns TRUE if there are lock waiters with a priority > iPriority ****************************************************************************/ -FLMBOOL FLMAPI F_LockObject::haveHigherPriorityWaiter( +FLMBOOL FTKAPI F_LockObject::haveHigherPriorityWaiter( FLMINT iPriority) { F_LOCK_WAITER * pLockWaiter; diff --git a/ftk/src/ftklog.cpp b/ftk/src/ftklog.cpp index 984251e..8aa0624 100644 --- a/ftk/src/ftklog.cpp +++ b/ftk/src/ftklog.cpp @@ -61,7 +61,7 @@ public: } } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar, FLMUINT uiCount) { @@ -91,7 +91,7 @@ public: return( iBytesOutput); } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar) { m_szLogBuf[ m_uiCharOffset++] = cChar; @@ -104,7 +104,7 @@ public: return( 1); } - FINLINE FLMINT FLMAPI outputStr( + FINLINE FLMINT FTKAPI outputStr( const char * pszStr, FLMUINT uiLen) { @@ -135,7 +135,7 @@ public: return( iBytesOutput); } - FLMINT FLMAPI colorFormatter( + FLMINT FTKAPI colorFormatter( char cFormatChar, eColorType eColor, FLMUINT uiFlags); @@ -154,7 +154,7 @@ private: /**************************************************************************** Desc: Main entry point for printf functionality. ****************************************************************************/ -void FLMAPI f_logPrintf( +void FTKAPI f_logPrintf( IF_LogMessageClient * pLogMessage, const char * pszFormatStr, ...) { @@ -169,7 +169,7 @@ void FLMAPI f_logPrintf( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_logPrintf( +void FTKAPI f_logPrintf( eLogMessageSeverity msgSeverity, const char * pszFormatStr, ...) { @@ -191,7 +191,7 @@ void FLMAPI f_logPrintf( /**************************************************************************** Desc: Printf routine that accepts a va_list argument ****************************************************************************/ -void FLMAPI f_logVPrintf( +void FTKAPI f_logVPrintf( IF_LogMessageClient * pLogMessage, const char * pszFormatStr, f_va_list * args) @@ -205,7 +205,7 @@ void FLMAPI f_logVPrintf( Desc: Returns an IF_LogMessageClient object if logging is enabled for the specified message type ****************************************************************************/ -IF_LogMessageClient * FLMAPI f_beginLogMessage( +IF_LogMessageClient * FTKAPI f_beginLogMessage( FLMUINT uiMsgType, eLogMessageSeverity eMsgSeverity) { @@ -232,7 +232,7 @@ Exit: /**************************************************************************** Desc: Logs information about an error ****************************************************************************/ -void FLMAPI f_logError( +void FTKAPI f_logError( RCODE rc, const char * pszDoing, const char * pszFileName, @@ -261,7 +261,7 @@ void FLMAPI f_logError( /**************************************************************************** Desc: Ends a logging message ****************************************************************************/ -void FLMAPI f_endLogMessage( +void FTKAPI f_endLogMessage( IF_LogMessageClient ** ppLogMessage) { if( *ppLogMessage) @@ -315,7 +315,7 @@ void f_loggerShutdown( void) /**************************************************************************** Desc: Set the toolkit logger client ****************************************************************************/ -FTKEXPC void FLMAPI f_setLoggerClient( +void FTKAPI f_setLoggerClient( IF_LoggerClient * pLogger) { f_mutexLock( gv_hLoggerMutex); @@ -349,7 +349,7 @@ void F_LogPrintfClient::flushLogBuffer( void) /**************************************************************************** Desc: Change colors - may only push or pop a color on to the color stack. ****************************************************************************/ -FLMINT FLMAPI F_LogPrintfClient::colorFormatter( +FLMINT FTKAPI F_LogPrintfClient::colorFormatter( char cFormatChar, eColorType eColor, FLMUINT uiFlags) diff --git a/ftk/src/ftkmem.cpp b/ftk/src/ftkmem.cpp index a8d8564..83e4994 100644 --- a/ftk/src/ftkmem.cpp +++ b/ftk/src/ftkmem.cpp @@ -195,21 +195,21 @@ public: virtual ~F_SlabManager(); - RCODE FLMAPI setup( + RCODE FTKAPI setup( FLMUINT uiPreallocSize); - RCODE FLMAPI allocSlab( + RCODE FTKAPI allocSlab( void ** ppSlab); - void FLMAPI freeSlab( + void FTKAPI freeSlab( void ** ppSlab); - RCODE FLMAPI resize( + RCODE FTKAPI resize( FLMUINT uiNumBytes, FLMBOOL bPreallocate, FLMUINT * puiActualSize = NULL); - void FLMAPI incrementTotalBytesAllocated( + void FTKAPI incrementTotalBytesAllocated( FLMUINT uiCount) { f_assertMutexNotLocked( m_hMutex); @@ -219,7 +219,7 @@ public: f_mutexUnlock( m_hMutex); } - void FLMAPI decrementTotalBytesAllocated( + void FTKAPI decrementTotalBytesAllocated( FLMUINT uiCount) { f_assertMutexNotLocked( m_hMutex); @@ -230,22 +230,22 @@ public: f_mutexUnlock( m_hMutex); } - FLMUINT FLMAPI getSlabSize( void) + FLMUINT FTKAPI getSlabSize( void) { return( m_uiSlabSize); } - FLMUINT FLMAPI getTotalSlabs( void) + FLMUINT FTKAPI getTotalSlabs( void) { return( m_uiTotalSlabs); } - FLMUINT FLMAPI totalBytesAllocated( void) + FLMUINT FTKAPI totalBytesAllocated( void) { return( m_uiTotalBytesAllocated); } - FLMUINT FLMAPI getTotalSlabBytesAllocated( void) + FLMUINT FTKAPI getTotalSlabBytesAllocated( void) { FLMUINT uiTotalSlabBytes; @@ -256,7 +256,7 @@ public: return( uiTotalSlabBytes); } - FLMUINT FLMAPI availSlabs( void) + FLMUINT FTKAPI availSlabs( void) { return( m_uiAvailSlabs); } @@ -278,12 +278,12 @@ private: void * pNext; } SLABHEADER; - static FLMINT FLMAPI slabAddrCompareFunc( + static FLMINT FTKAPI slabAddrCompareFunc( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2); - static void FLMAPI slabAddrSwapFunc( + static void FTKAPI slabAddrSwapFunc( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2); @@ -360,7 +360,7 @@ public: virtual ~F_FixedAlloc(); - RCODE FLMAPI setup( + RCODE FTKAPI setup( FLMBOOL bMultiThreaded, IF_SlabManager * pSlabManager, IF_Relocator * pDefaultRelocator, @@ -368,28 +368,28 @@ public: FLM_SLAB_USAGE * pUsageStats, FLMUINT * puiTotalBytesAllocated); - void * FLMAPI allocCell( + void * FTKAPI allocCell( IF_Relocator * pRelocator, void * pvInitialData = NULL, FLMUINT uiDataSize = 0); - void * FLMAPI allocCell( + void * FTKAPI allocCell( IF_Relocator * pRelocator, F_ALLOC_INIT_FUNC fnAllocInit); - void FLMAPI freeCell( + void FTKAPI freeCell( void * ptr); - void FLMAPI freeUnused( void); + void FTKAPI freeUnused( void); - void FLMAPI freeAll( void); + void FTKAPI freeAll( void); - FLMUINT FLMAPI getCellSize( void) + FLMUINT FTKAPI getCellSize( void) { return( m_uiCellSize); } - void FLMAPI defragmentMemory( void); + void FTKAPI defragmentMemory( void); private: @@ -416,7 +416,7 @@ private: void testForLeaks( void); #endif - static FLMINT FLMAPI slabAddrCompareFunc( + static FLMINT FTKAPI slabAddrCompareFunc( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -434,7 +434,7 @@ private: return( 1); } - static void FLMAPI slabAddrSwapFunc( + static void FTKAPI slabAddrSwapFunc( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -487,14 +487,14 @@ public: virtual ~F_BufferAlloc(); - RCODE FLMAPI setup( + RCODE FTKAPI setup( FLMBOOL bMultiThreaded, IF_SlabManager * pSlabManager, IF_Relocator * pDefaultRelocator, FLM_SLAB_USAGE * pUsageStats, FLMUINT * puiTotalBytesAllocated); - RCODE FLMAPI allocBuf( + RCODE FTKAPI allocBuf( IF_Relocator * pRelocator, FLMUINT uiSize, void * pvInitialData, @@ -502,14 +502,14 @@ public: FLMBYTE ** ppucBuffer, FLMBOOL * pbAllocatedOnHeap = NULL); - RCODE FLMAPI allocBuf( + RCODE FTKAPI allocBuf( IF_Relocator * pRelocator, FLMUINT uiSize, F_ALLOC_INIT_FUNC fnAllocInit, FLMBYTE ** ppucBuffer, FLMBOOL * pbAllocatedOnHeap = NULL); - RCODE FLMAPI reallocBuf( + RCODE FTKAPI reallocBuf( IF_Relocator * pRelocator, FLMUINT uiOldSize, FLMUINT uiNewSize, @@ -518,20 +518,20 @@ public: FLMBYTE ** ppucBuffer, FLMBOOL * pbAllocatedOnHeap = NULL); - void FLMAPI freeBuf( + void FTKAPI freeBuf( FLMUINT uiSize, FLMBYTE ** ppucBuffer); - FLMUINT FLMAPI getTrueSize( + FLMUINT FTKAPI getTrueSize( FLMUINT uiSize, FLMBYTE * pucBuffer); - FLMUINT FLMAPI getMaxCellSize( void) + FLMUINT FTKAPI getMaxCellSize( void) { return( MAX_CELL_SIZE); } - void FLMAPI defragmentMemory( void); + void FTKAPI defragmentMemory( void); private: @@ -563,7 +563,7 @@ public: cleanup(); } - RCODE FLMAPI setup( + RCODE FTKAPI setup( FLMBOOL bMultiThreaded, IF_SlabManager * pSlabManager, IF_Relocator * pDefaultRelocator, @@ -571,28 +571,28 @@ public: FLM_SLAB_USAGE * pUsageStats, FLMUINT * puiTotalBytesAllocated); - RCODE FLMAPI allocBuf( + RCODE FTKAPI allocBuf( IF_Relocator * pRelocator, FLMUINT uiSize, FLMBYTE ** ppucBuffer); - RCODE FLMAPI allocBuf( + RCODE FTKAPI allocBuf( IF_Relocator * pRelocator, FLMUINT uiSize, F_ALLOC_INIT_FUNC fnAllocInit, FLMBYTE ** ppucBuffer); - RCODE FLMAPI reallocBuf( + RCODE FTKAPI reallocBuf( IF_Relocator * pRelocator, FLMUINT uiNewSize, FLMBYTE ** ppucBuffer); - void FLMAPI freeBuf( + void FTKAPI freeBuf( FLMBYTE ** ppucBuffer); - void FLMAPI defragmentMemory( void); + void FTKAPI defragmentMemory( void); - FLMUINT FLMAPI getTrueSize( + FLMUINT FTKAPI getTrueSize( FLMBYTE * pucBuffer); private: @@ -742,7 +742,7 @@ private: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocSlabManager( +RCODE FTKAPI FlmAllocSlabManager( IF_SlabManager ** ppSlabManager) { if( (*ppSlabManager = f_new F_SlabManager) == NULL) @@ -756,7 +756,7 @@ RCODE FLMAPI FlmAllocSlabManager( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocFixedAllocator( +RCODE FTKAPI FlmAllocFixedAllocator( IF_FixedAlloc ** ppFixedAllocator) { if( (*ppFixedAllocator = f_new F_FixedAlloc) == NULL) @@ -770,7 +770,7 @@ RCODE FLMAPI FlmAllocFixedAllocator( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocBufferAllocator( +RCODE FTKAPI FlmAllocBufferAllocator( IF_BufferAlloc ** ppBufferAllocator) { if( (*ppBufferAllocator = f_new F_BufferAlloc) == NULL) @@ -784,7 +784,7 @@ RCODE FLMAPI FlmAllocBufferAllocator( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocMultiAllocator( +RCODE FTKAPI FlmAllocMultiAllocator( IF_MultiAlloc ** ppMultiAllocator) { if( (*ppMultiAllocator = f_new F_MultiAlloc) == NULL) @@ -1569,7 +1569,7 @@ void f_memoryCleanup( void) /******************************************************************** Desc: Allocate Memory. *********************************************************************/ -RCODE FLMAPI f_allocImp( +RCODE FTKAPI f_allocImp( FLMUINT uiSize, void ** ppvPtr, FLMBOOL bAllocFromNewOp, @@ -1615,7 +1615,7 @@ Exit: /******************************************************************** Desc: Allocate and initialize memory. *********************************************************************/ -RCODE FLMAPI f_callocImp( +RCODE FTKAPI f_callocImp( FLMUINT uiSize, void ** ppvPtr, const char * pszFileName, @@ -1658,7 +1658,7 @@ Exit: /******************************************************************** Desc: Reallocate memory. *********************************************************************/ -RCODE FLMAPI f_reallocImp( +RCODE FTKAPI f_reallocImp( FLMUINT uiSize, void ** ppvPtr, const char * pszFileName, @@ -1745,7 +1745,7 @@ Exit: /******************************************************************** Desc: Reallocate memory, and initialize the new part. *********************************************************************/ -RCODE FLMAPI f_recallocImp( +RCODE FTKAPI f_recallocImp( FLMUINT uiSize, void ** ppvPtr, const char * pszFileName, @@ -1839,7 +1839,7 @@ Exit: /******************************************************************** Desc: Free previously allocated memory. *********************************************************************/ -void FLMAPI f_freeImp( +void FTKAPI f_freeImp( void ** ppvPtr, FLMBOOL bFreeFromDeleteOp) { @@ -1951,7 +1951,7 @@ Note: If the number of bytes is more than the what is left in the current block then a new block will be allocated and the lbkl element of the PMS will be updated. ****************************************************************************/ -RCODE FLMAPI F_Pool::poolAlloc( +RCODE FTKAPI F_Pool::poolAlloc( FLMUINT uiSize, void ** ppvPtr) { @@ -2045,7 +2045,7 @@ Exit: /**************************************************************************** Desc: Allocates a block of memory from a memory pool. ****************************************************************************/ -RCODE FLMAPI F_Pool::poolCalloc( +RCODE FTKAPI F_Pool::poolCalloc( FLMUINT uiSize, void ** ppvPtr) { @@ -2062,7 +2062,7 @@ RCODE FLMAPI F_Pool::poolCalloc( Desc : Releases all memory allocated to a pool. Note : All memory allocated to the pool is returned to the operating system. *****************************************************************************/ -void FLMAPI F_Pool::poolFree( void) +void FTKAPI F_Pool::poolFree( void) { PoolMemoryBlock * pBlock = m_pLastBlock; PoolMemoryBlock * pPrevBlock; @@ -2091,7 +2091,7 @@ Desc: Resets memory blocks allocated to a pool. Note: Will reset the free space in the first memory block, and if any extra blocks exist they will be freed (destroyed). *****************************************************************************/ -void FLMAPI F_Pool::poolReset( +void FTKAPI F_Pool::poolReset( void * pvMark, FLMBOOL bReduceFirstBlock) { @@ -2243,7 +2243,7 @@ F_SlabManager::~F_SlabManager() /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_SlabManager::setup( +RCODE FTKAPI F_SlabManager::setup( FLMUINT uiPreallocSize) { RCODE rc = NE_FLM_OK; @@ -2301,7 +2301,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_SlabManager::resize( +RCODE FTKAPI F_SlabManager::resize( FLMUINT uiNumBytes, FLMBOOL bPreallocate, FLMUINT * puiActualSize) @@ -2431,7 +2431,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_SlabManager::allocSlab( +RCODE FTKAPI F_SlabManager::allocSlab( void ** ppSlab) { RCODE rc = NE_FLM_OK; @@ -2495,7 +2495,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_SlabManager::freeSlab( +void FTKAPI F_SlabManager::freeSlab( void ** ppSlab) { f_assert( ppSlab && *ppSlab); @@ -2631,7 +2631,7 @@ void F_SlabManager::releaseSlabToSystem( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI F_SlabManager::slabAddrCompareFunc( +FLMINT FTKAPI F_SlabManager::slabAddrCompareFunc( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -2652,7 +2652,7 @@ FLMINT FLMAPI F_SlabManager::slabAddrCompareFunc( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_SlabManager::slabAddrSwapFunc( +void FTKAPI F_SlabManager::slabAddrSwapFunc( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -2888,7 +2888,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void * FLMAPI F_FixedAlloc::allocCell( +void * FTKAPI F_FixedAlloc::allocCell( IF_Relocator * pRelocator, void * pvInitialData, FLMUINT uiDataSize) @@ -2932,7 +2932,7 @@ Exit: /**************************************************************************** Desc: Public method to free a cell of memory back to the system. ****************************************************************************/ -void * FLMAPI F_FixedAlloc::allocCell( +void * FTKAPI F_FixedAlloc::allocCell( IF_Relocator * pRelocator, F_ALLOC_INIT_FUNC fnAllocInit) { @@ -3117,7 +3117,7 @@ Exit: /**************************************************************************** Desc: Public method to free a cell of memory back to the system. ****************************************************************************/ -void FLMAPI F_FixedAlloc::freeCell( +void FTKAPI F_FixedAlloc::freeCell( void * ptr) { if( m_hMutex != F_MUTEX_NULL) @@ -3440,7 +3440,7 @@ void F_FixedAlloc::freeSlab( /**************************************************************************** Desc: Public method to free all the memory in the system. ****************************************************************************/ -void FLMAPI F_FixedAlloc::freeAll( void) +void FTKAPI F_FixedAlloc::freeAll( void) { FIXEDSLAB * pFreeMe; @@ -3672,7 +3672,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_FixedAlloc::freeUnused( void) +void FTKAPI F_FixedAlloc::freeUnused( void) { FIXEDSLAB * pSlab; @@ -3893,7 +3893,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_BufferAlloc::allocBuf( +RCODE FTKAPI F_BufferAlloc::allocBuf( IF_Relocator * pRelocator, FLMUINT uiSize, void * pvInitialData, @@ -3961,7 +3961,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_BufferAlloc::allocBuf( +RCODE FTKAPI F_BufferAlloc::allocBuf( IF_Relocator * pRelocator, FLMUINT uiSize, F_ALLOC_INIT_FUNC fnAllocInit, @@ -4028,7 +4028,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_BufferAlloc::reallocBuf( +RCODE FTKAPI F_BufferAlloc::reallocBuf( IF_Relocator * pRelocator, FLMUINT uiOldSize, FLMUINT uiNewSize, @@ -4511,7 +4511,7 @@ void F_MultiAlloc::cleanup( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_MultiAlloc::allocBuf( +RCODE FTKAPI F_MultiAlloc::allocBuf( IF_Relocator * pRelocator, FLMUINT uiSize, FLMBYTE ** ppucBuffer) @@ -4550,7 +4550,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_MultiAlloc::allocBuf( +RCODE FTKAPI F_MultiAlloc::allocBuf( IF_Relocator * pRelocator, FLMUINT uiSize, F_ALLOC_INIT_FUNC fnAllocInit, @@ -4590,7 +4590,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_MultiAlloc::reallocBuf( +RCODE FTKAPI F_MultiAlloc::reallocBuf( IF_Relocator * pRelocator, FLMUINT uiNewSize, FLMBYTE ** ppucBuffer) @@ -4649,7 +4649,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_MultiAlloc::freeBuf( +void FTKAPI F_MultiAlloc::freeBuf( FLMBYTE ** ppucBuffer) { if( ppucBuffer && *ppucBuffer) @@ -4673,7 +4673,7 @@ void FLMAPI F_MultiAlloc::freeBuf( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_MultiAlloc::getTrueSize( +FLMUINT FTKAPI F_MultiAlloc::getTrueSize( FLMBYTE * pucBuffer) { FLMUINT uiSize; @@ -4775,7 +4775,7 @@ IF_FixedAlloc * F_MultiAlloc::getAllocator( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_allocAlignedBufferImp( +RCODE FTKAPI f_allocAlignedBufferImp( FLMUINT uiMinSize, void ** ppvAlloc) { @@ -4859,7 +4859,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_freeAlignedBufferImp( +void FTKAPI f_freeAlignedBufferImp( void ** ppvAlloc) { if( *ppvAlloc) @@ -4895,7 +4895,7 @@ void FLMAPI f_freeAlignedBufferImp( /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI f_canGetMemoryInfo( void) +FLMBOOL FTKAPI f_canGetMemoryInfo( void) { if( RC_OK( f_getMemoryInfo( NULL, NULL))) { @@ -4908,7 +4908,7 @@ FLMBOOL FLMAPI f_canGetMemoryInfo( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_getMemoryInfo( +RCODE FTKAPI f_getMemoryInfo( FLMUINT64 * pui64TotalPhysMem, FLMUINT64 * pui64AvailPhysMem) { diff --git a/ftk/src/ftkmfh.cpp b/ftk/src/ftkmfh.cpp index e569ddd..1010e47 100644 --- a/ftk/src/ftkmfh.cpp +++ b/ftk/src/ftkmfh.cpp @@ -50,47 +50,47 @@ public: virtual ~F_MultiFileHdl(); - void FLMAPI closeFile( + void FTKAPI closeFile( FLMBOOL bDelete = FALSE); - RCODE FLMAPI createFile( + RCODE FTKAPI createFile( const char * pszPath); - RCODE FLMAPI createUniqueFile( + RCODE FTKAPI createUniqueFile( const char * pszPath, const char * pszFileExtension); - RCODE FLMAPI deleteMultiFile( + RCODE FTKAPI deleteMultiFile( const char * pszPath); - RCODE FLMAPI openFile( + RCODE FTKAPI openFile( const char * pszPath); - RCODE FLMAPI flush( void); + RCODE FTKAPI flush( void); - RCODE FLMAPI read( + RCODE FTKAPI read( FLMUINT64 ui64Offset, FLMUINT uiLength, void * pvBuffer, FLMUINT * puiBytesRead); - RCODE FLMAPI write( + RCODE FTKAPI write( FLMUINT64 ui64Offset, FLMUINT uiLength, void * pvBuffer, FLMUINT * puiBytesWritten); - RCODE FLMAPI getPath( + RCODE FTKAPI getPath( char * pszFilePath); - FINLINE RCODE FLMAPI size( + FINLINE RCODE FTKAPI size( FLMUINT64 * pui64FileSize) { *pui64FileSize = m_ui64EOF; return( NE_FLM_OK); } - RCODE FLMAPI truncateFile( + RCODE FTKAPI truncateFile( FLMUINT64 ui64NewSize); private: @@ -183,7 +183,7 @@ private: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocMultiFileHdl( +RCODE FTKAPI FlmAllocMultiFileHdl( IF_MultiFileHdl ** ppFileHdl) { if( (*ppFileHdl = f_new F_MultiFileHdl) == NULL) @@ -1029,7 +1029,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_MultiFileHdl::getPath( +RCODE FTKAPI F_MultiFileHdl::getPath( char * pszPath) { f_strcpy( pszPath, m_szPath); diff --git a/ftk/src/ftkmisc.cpp b/ftk/src/ftkmisc.cpp index 1dff3de..f083123 100644 --- a/ftk/src/ftkmisc.cpp +++ b/ftk/src/ftkmisc.cpp @@ -102,7 +102,7 @@ static FLMBYTE ucSENPrefixArray[] = /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI ftkStartup( void) +RCODE FTKAPI ftkStartup( void) { RCODE rc = NE_FLM_OK; @@ -254,7 +254,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI ftkShutdown( void) +void FTKAPI ftkShutdown( void) { if( !gv_startupCount || f_atomicDec( &gv_startupCount) > 0) { @@ -300,7 +300,7 @@ Desc: This routine causes the calling process to delay the given number time is almost guaranteed to be different from requested sleep time. ****************************************************************************/ #ifdef FLM_UNIX -void FLMAPI f_sleep( +void FTKAPI f_sleep( FLMUINT uiMilliseconds) { #ifdef FLM_AIX @@ -325,7 +325,7 @@ void FLMAPI f_sleep( Desc: ****************************************************************************/ #ifdef FLM_WIN -void FLMAPI f_sleep( +void FTKAPI f_sleep( FLMUINT uiMilliseconds) { SleepEx( (DWORD)uiMilliseconds, true); @@ -336,7 +336,7 @@ void FLMAPI f_sleep( Desc: ****************************************************************************/ #ifdef FLM_LIBC_NLM -void FLMAPI f_sleep( +void FTKAPI f_sleep( FLMUINT uiMilliseconds) { if( !uiMilliseconds ) @@ -354,7 +354,7 @@ void FLMAPI f_sleep( Desc: ****************************************************************************/ #ifdef FLM_RING_ZERO_NLM -void FLMAPI f_sleep( +void FTKAPI f_sleep( FLMUINT uiMilliseconds) { if( !uiMilliseconds) @@ -430,7 +430,7 @@ Desc: This routine will use the operating system calls to generate a support generating GUIDs, this routine will generate a pseudo-GUID using a random number generator. A serial number is 16-bytes. ****************************************************************************/ -RCODE FLMAPI f_createSerialNumber( +RCODE FTKAPI f_createSerialNumber( FLMBYTE * pszSerialNum) { RCODE rc = NE_FLM_OK; @@ -470,7 +470,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_getenv( +void FTKAPI f_getenv( const char * pszKey, FLMBYTE * pszBuffer, FLMUINT uiBufferSize, @@ -510,7 +510,7 @@ Exit: /*************************************************************************** Desc: Sort an array of items ****************************************************************************/ -void FLMAPI f_qsort( +void FTKAPI f_qsort( void * pvBuffer, FLMUINT uiLowerBounds, FLMUINT uiUpperBounds, @@ -627,7 +627,7 @@ Iterate_Larger_Half: /*************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_qsortUINTCompare( +FLMINT FTKAPI f_qsortUINTCompare( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -650,7 +650,7 @@ FLMINT FLMAPI f_qsortUINTCompare( /*************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_qsortUINTSwap( +void FTKAPI f_qsortUINTSwap( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -665,7 +665,7 @@ void FLMAPI f_qsortUINTSwap( /**************************************************************************** Desc: ****************************************************************************/ -void * FLMAPI f_memcpy( +void * FTKAPI f_memcpy( void * pvDest, const void * pvSrc, FLMSIZET iSize) @@ -687,7 +687,7 @@ void * FLMAPI f_memcpy( /**************************************************************************** Desc: ****************************************************************************/ -void * FLMAPI f_memmove( +void * FTKAPI f_memmove( void * pvDest, const void * pvSrc, FLMSIZET uiLength) @@ -782,7 +782,7 @@ void * FLMAPI f_memmove( /**************************************************************************** Desc: ****************************************************************************/ -void * FLMAPI f_memset( +void * FTKAPI f_memset( void * pvMem, unsigned char ucByte, FLMSIZET uiLength) @@ -826,7 +826,7 @@ void * FLMAPI f_memset( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_memcmp( +FLMINT FTKAPI f_memcmp( const void * pvMem1, const void * pvMem2, FLMSIZET uiLength) @@ -861,7 +861,7 @@ FLMINT FLMAPI f_memcmp( /**************************************************************************** Desc: ****************************************************************************/ -char * FLMAPI f_strcpy( +char * FTKAPI f_strcpy( char * pszDest, const char * pszSrc) { @@ -876,7 +876,7 @@ char * FLMAPI f_strcpy( /**************************************************************************** Desc: ****************************************************************************/ -char * FLMAPI f_strncpy( +char * FTKAPI f_strncpy( char * pszDest, const char * pszSrc, FLMSIZET uiLength) @@ -903,7 +903,7 @@ char * FLMAPI f_strncpy( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI f_strlen( +FLMUINT FTKAPI f_strlen( const char * pszStr) { #ifndef FLM_NLM @@ -923,7 +923,7 @@ FLMUINT FLMAPI f_strlen( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_strcmp( +FLMINT FTKAPI f_strcmp( const char * pszStr1, const char * pszStr2) { @@ -943,7 +943,7 @@ FLMINT FLMAPI f_strcmp( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_stricmp( +FLMINT FTKAPI f_stricmp( const char * pszStr1, const char * pszStr2) { @@ -962,7 +962,7 @@ FLMINT FLMAPI f_stricmp( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_strncmp( +FLMINT FTKAPI f_strncmp( const char * pszStr1, const char * pszStr2, FLMSIZET uiLength) @@ -989,7 +989,7 @@ FLMINT FLMAPI f_strncmp( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_strnicmp( +FLMINT FTKAPI f_strnicmp( const char * pszStr1, const char * pszStr2, FLMSIZET uiLength) @@ -1023,7 +1023,7 @@ FLMINT FLMAPI f_strnicmp( /**************************************************************************** Desc: ****************************************************************************/ -char * FLMAPI f_strcat( +char * FTKAPI f_strcat( char * pszDest, const char * pszSrc) { @@ -1044,7 +1044,7 @@ char * FLMAPI f_strcat( /**************************************************************************** Desc: ****************************************************************************/ -char * FLMAPI f_strncat( +char * FTKAPI f_strncat( char * pszDest, const char * pszSrc, FLMSIZET uiLength) @@ -1077,7 +1077,7 @@ char * FLMAPI f_strncat( /**************************************************************************** Desc: ****************************************************************************/ -char * FLMAPI f_strchr( +char * FTKAPI f_strchr( const char * pszStr, unsigned char ucByte) { @@ -1103,7 +1103,7 @@ char * FLMAPI f_strchr( /**************************************************************************** Desc: ****************************************************************************/ -char * FLMAPI f_strrchr( +char * FTKAPI f_strrchr( const char * pszStr, unsigned char ucByte) { @@ -1139,7 +1139,7 @@ char * FLMAPI f_strrchr( /**************************************************************************** Desc: ****************************************************************************/ -char * FLMAPI f_strstr( +char * FTKAPI f_strstr( const char * pszStr1, const char * pszStr2) { @@ -1179,7 +1179,7 @@ Desc: Turn a base 24 digit's ordinal value into a native Notes: This is a base 24 alphanumeric value where {a, b, c, d, e, f, i, l, o, r, u, v } values are removed. ****************************************************************************/ -FLMBYTE FLMAPI f_getBase24DigitChar( +FLMBYTE FTKAPI f_getBase24DigitChar( FLMBYTE ucValue) { f_assert( ucValue <= 23); @@ -1223,7 +1223,7 @@ FLMBYTE FLMAPI f_getBase24DigitChar( /**************************************************************************** Desc: ****************************************************************************/ -char * FLMAPI f_strupr( +char * FTKAPI f_strupr( char * pszStr) { #ifdef FLM_WIN @@ -1242,7 +1242,7 @@ char * FLMAPI f_strupr( /********************************************************************** Desc: **********************************************************************/ -FLMINT32 FLMAPI f_atomicInc( +FLMINT32 FTKAPI f_atomicInc( FLMATOMIC * piTarget) { #if defined( FLM_LIBC_NLM) @@ -1295,7 +1295,7 @@ FLMINT32 FLMAPI f_atomicInc( /********************************************************************** Desc: **********************************************************************/ -FLMINT32 FLMAPI f_atomicDec( +FLMINT32 FTKAPI f_atomicDec( FLMATOMIC * piTarget) { #if defined( FLM_LIBC_NLM) @@ -1348,7 +1348,7 @@ FLMINT32 FLMAPI f_atomicDec( /********************************************************************** Desc: **********************************************************************/ -FLMINT32 FLMAPI f_atomicExchange( +FLMINT32 FTKAPI f_atomicExchange( FLMATOMIC * piTarget, FLMINT32 i32NewVal) { @@ -1425,7 +1425,7 @@ FLMINT32 FLMAPI f_atomicExchange( /********************************************************************** Desc: **********************************************************************/ -FLMINT FLMAPI F_Object::getRefCount( void) +FLMINT FTKAPI F_Object::getRefCount( void) { return( m_refCnt); } @@ -1433,7 +1433,7 @@ FLMINT FLMAPI F_Object::getRefCount( void) /********************************************************************** Desc: **********************************************************************/ -FLMINT FLMAPI F_Object::AddRef( void) +FLMINT FTKAPI F_Object::AddRef( void) { return( ++m_refCnt); } @@ -1441,7 +1441,7 @@ FLMINT FLMAPI F_Object::AddRef( void) /********************************************************************** Desc: **********************************************************************/ -FLMINT FLMAPI F_Object::Release( void) +FLMINT FTKAPI F_Object::Release( void) { FLMINT iRefCnt = --m_refCnt; @@ -1456,7 +1456,7 @@ FLMINT FLMAPI F_Object::Release( void) /********************************************************************** Desc: **********************************************************************/ -IF_FileSystem * FLMAPI f_getFileSysPtr( void) +IF_FileSystem * FTKAPI f_getFileSysPtr( void) { return( gv_pFileSystem); } @@ -1464,7 +1464,7 @@ IF_FileSystem * FLMAPI f_getFileSysPtr( void) /********************************************************************** Desc: **********************************************************************/ -FLMUINT FLMAPI f_getOpenFileCount( void) +FLMUINT FTKAPI f_getOpenFileCount( void) { return( gv_openFiles); } @@ -1480,7 +1480,7 @@ IF_ThreadMgr * f_getThreadMgrPtr( void) /********************************************************************** Desc: **********************************************************************/ -FLMUINT FLMAPI f_getMaxFileSize( void) +FLMUINT FTKAPI f_getMaxFileSize( void) { return( gv_uiMaxFileSize); } @@ -1488,7 +1488,7 @@ FLMUINT FLMAPI f_getMaxFileSize( void) /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI f_readSEN( +RCODE FTKAPI f_readSEN( IF_IStream * pIStream, FLMUINT * puiValue, FLMUINT * puiLength) @@ -1520,7 +1520,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI f_readSEN64( +RCODE FTKAPI f_readSEN64( IF_IStream * pIStream, FLMUINT64 * pui64Value, FLMUINT * puiLength) @@ -1582,7 +1582,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -FLMUINT FLMAPI f_getSENLength( +FLMUINT FTKAPI f_getSENLength( FLMBYTE ucByte) { return( gv_ucSENLengthArray[ ucByte]); @@ -1591,7 +1591,7 @@ FLMUINT FLMAPI f_getSENLength( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_decodeSEN64( +RCODE FTKAPI f_decodeSEN64( const FLMBYTE ** ppucBuffer, const FLMBYTE * pucEnd, FLMUINT64 * pui64Value) @@ -1694,7 +1694,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_decodeSEN( +RCODE FTKAPI f_decodeSEN( const FLMBYTE ** ppucBuffer, const FLMBYTE * pucEnd, FLMUINT * puiValue) @@ -1733,7 +1733,7 @@ FINLINE FLMBYTE f_shiftRightRetByte( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI f_getSENByteCount( +FLMUINT FTKAPI f_getSENByteCount( FLMUINT64 ui64Num) { FLMUINT uiCount = 0; @@ -1759,7 +1759,7 @@ FLMUINT FLMAPI f_getSENByteCount( /**************************************************************************** Desc: Encodes a number as a SEN ****************************************************************************/ -FLMUINT FLMAPI f_encodeSEN( +FLMUINT FTKAPI f_encodeSEN( FLMUINT64 ui64Value, FLMBYTE ** ppucBuffer, FLMUINT uiSizeWanted) @@ -1796,7 +1796,7 @@ FLMUINT FLMAPI f_encodeSEN( /**************************************************************************** Desc: Encodes a number as a SEN ****************************************************************************/ -RCODE FLMAPI f_encodeSEN( +RCODE FTKAPI f_encodeSEN( FLMUINT64 ui64Value, FLMBYTE ** ppucBuffer, FLMBYTE * pucEnd) @@ -1838,7 +1838,7 @@ Exit: /**************************************************************************** Desc: Encodes a number as a SEN ****************************************************************************/ -FLMUINT FLMAPI f_encodeSENKnownLength( +FLMUINT FTKAPI f_encodeSENKnownLength( FLMUINT64 ui64Value, FLMUINT uiSenLen, FLMBYTE ** ppucBuffer) @@ -1869,7 +1869,7 @@ FLMUINT FLMAPI f_encodeSENKnownLength( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmGetXMLObject( +RCODE FTKAPI FlmGetXMLObject( IF_XML ** ppXmlObject) { *ppXmlObject = gv_pXml; @@ -1889,7 +1889,7 @@ IF_XML * f_getXmlObjPtr( void) /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT32 FLMAPI f_getRandomUINT32( +FLMUINT32 FTKAPI f_getRandomUINT32( FLMUINT32 ui32Low, FLMUINT32 ui32High) { @@ -1905,7 +1905,7 @@ FLMUINT32 FLMAPI f_getRandomUINT32( /**************************************************************************** Desc: ****************************************************************************/ -FLMBYTE FLMAPI f_getRandomByte( void) +FLMBYTE FTKAPI f_getRandomByte( void) { FLMBYTE ucValue; @@ -2224,7 +2224,7 @@ void F_ListItem::removeFromList( /**************************************************************************** Desc: This routine allocates and initializes a hash table. ****************************************************************************/ -RCODE FLMAPI f_allocHashTable( +RCODE FTKAPI f_allocHashTable( FLMUINT uiHashTblSize, F_BUCKET ** ppHashTblRV) { @@ -2287,7 +2287,7 @@ Exit: /**************************************************************************** Desc: This routine determines the hash bucket for a string. ****************************************************************************/ -FLMUINT FLMAPI f_strHashBucket( +FLMUINT FTKAPI f_strHashBucket( char * pszStr, F_BUCKET * pHashTbl, FLMUINT uiNumBuckets) @@ -2316,7 +2316,7 @@ FLMUINT FLMAPI f_strHashBucket( Desc: This routine determines the hash bucket for a binary array of characters. ****************************************************************************/ -FLMUINT FLMAPI f_binHashBucket( +FLMUINT FTKAPI f_binHashBucket( void * pBuf, FLMUINT uiBufLen, F_BUCKET * pHashTbl, @@ -2388,7 +2388,7 @@ F_HashTable::~F_HashTable() /**************************************************************************** Desc: Configures the hash table prior to first use ****************************************************************************/ -RCODE FLMAPI F_HashTable::setupHashTable( +RCODE FTKAPI F_HashTable::setupHashTable( FLMBOOL bMultithreaded, FLMUINT uiNumBuckets, FLMUINT uiMaxObjects) @@ -2483,7 +2483,7 @@ Exit: /**************************************************************************** Desc: Adds an object to the hash table ****************************************************************************/ -RCODE FLMAPI F_HashTable::addObject( +RCODE FTKAPI F_HashTable::addObject( F_HashObject * pObject, FLMBOOL bAllowDuplicates) { @@ -2570,7 +2570,7 @@ Exit: Desc: Returns the next object in the linked list of objects in the hash table. If *ppObject == NULL, the first object will be returned. ****************************************************************************/ -RCODE FLMAPI F_HashTable::getNextObjectInGlobal( +RCODE FTKAPI F_HashTable::getNextObjectInGlobal( F_HashObject ** ppObject) { RCODE rc = NE_FLM_OK; @@ -2617,7 +2617,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HashTable::getNextObjectInBucket( +RCODE FTKAPI F_HashTable::getNextObjectInBucket( F_HashObject ** ppObject) { RCODE rc = NE_FLM_OK; @@ -2661,7 +2661,7 @@ Exit: /**************************************************************************** Desc: Retrieves an object from the hash table with the specified key ****************************************************************************/ -RCODE FLMAPI F_HashTable::getObject( +RCODE FTKAPI F_HashTable::getObject( const void * pvKey, FLMUINT uiKeyLen, F_HashObject ** ppObject, @@ -2720,7 +2720,7 @@ Exit: /**************************************************************************** Desc: Removes an object from the hash table by key ****************************************************************************/ -RCODE FLMAPI F_HashTable::removeObject( +RCODE FTKAPI F_HashTable::removeObject( void * pvKey, FLMUINT uiKeyLen) { @@ -2730,7 +2730,7 @@ RCODE FLMAPI F_HashTable::removeObject( /**************************************************************************** Desc: Removes an object from the hash table by object pointer ****************************************************************************/ -RCODE FLMAPI F_HashTable::removeObject( +RCODE FTKAPI F_HashTable::removeObject( F_HashObject * pObject) { const void * pvKey = pObject->getKey(); @@ -2742,7 +2742,7 @@ RCODE FLMAPI F_HashTable::removeObject( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_HashTable::removeAllObjects( void) +void FTKAPI F_HashTable::removeAllObjects( void) { F_HashObject * pCur; FLMBOOL bMutexLocked = FALSE; @@ -2783,7 +2783,7 @@ void FLMAPI F_HashTable::removeAllObjects( void) /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_HashTable::removeAgedObjects( +void FTKAPI F_HashTable::removeAgedObjects( FLMUINT uiMaxAge) { F_HashObject * pCur; @@ -2829,7 +2829,7 @@ void FLMAPI F_HashTable::removeAgedObjects( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_HashTable::getMaxObjects( void) +FLMUINT FTKAPI F_HashTable::getMaxObjects( void) { FLMUINT uiMaxObjects; @@ -2851,7 +2851,7 @@ FLMUINT FLMAPI F_HashTable::getMaxObjects( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_HashTable::setMaxObjects( +RCODE FTKAPI F_HashTable::setMaxObjects( FLMUINT uiMaxObjects) { F_HashObject * pCur; @@ -3067,7 +3067,7 @@ void f_freeFileAsyncClientList( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_stripCRLF( +RCODE FTKAPI f_stripCRLF( const FLMBYTE * pucSourceBuf, FLMUINT uiSourceLength, F_DynaBuf * pDestBuf) @@ -3102,7 +3102,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_base64Encode( +RCODE FTKAPI f_base64Encode( const char * pData, FLMUINT uiDataLength, F_DynaBuf * pBuffer) @@ -3146,7 +3146,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI f_isNumber( +FLMBOOL FTKAPI f_isNumber( const char * pszStr, FLMBOOL * pbNegative, FLMBOOL * pbHex) @@ -3234,7 +3234,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_Vector::setElementAt( +RCODE FTKAPI F_Vector::setElementAt( void * pData, FLMUINT uiIndex) { @@ -3273,7 +3273,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void * FLMAPI F_Vector::getElementAt( +void * FTKAPI F_Vector::getElementAt( FLMUINT uiIndex) { f_assert( uiIndex < m_uiArraySize); @@ -3284,7 +3284,7 @@ void * FLMAPI F_Vector::getElementAt( /**************************************************************************** Desc: Append a char (or the same char many times) to the string ****************************************************************************/ -RCODE FLMAPI F_StringAcc::appendCHAR( +RCODE FTKAPI F_StringAcc::appendCHAR( char ucChar, FLMUINT uiHowMany) { @@ -3325,7 +3325,7 @@ Desc: appending text to the accumulator safely. all other methods in the class funnel through this one, as this one contains the logic for making sure storage requirements are met. ****************************************************************************/ -RCODE FLMAPI F_StringAcc::appendTEXT( +RCODE FTKAPI F_StringAcc::appendTEXT( const FLMBYTE * pszVal) { RCODE rc = NE_FLM_OK; @@ -3417,7 +3417,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_StringAcc::printf( +RCODE FTKAPI F_StringAcc::printf( const char * pszFormatString, ...) { @@ -3455,7 +3455,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_StringAcc::appendf( +RCODE FTKAPI F_StringAcc::appendf( const char * pszFormatString, ...) { diff --git a/ftk/src/ftknet.cpp b/ftk/src/ftknet.cpp index 4acbab6..fc72a8e 100644 --- a/ftk/src/ftknet.cpp +++ b/ftk/src/ftknet.cpp @@ -54,11 +54,11 @@ public: } } - RCODE FLMAPI bind( + RCODE FTKAPI bind( FLMUINT uiBindPort, FLMBYTE * pucBindAddr = NULL); - RCODE FLMAPI connectClient( + RCODE FTKAPI connectClient( IF_TCPIOStream ** ppClientStream, FLMUINT uiTimeout = 3); @@ -83,76 +83,76 @@ public: virtual ~F_TCPIOStream( void); - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( const char * pucHostAddress, FLMUINT uiPort, FLMUINT uiFlags, FLMUINT uiConnectTimeout); - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( int iSocket, FLMUINT uiFlags); - RCODE FLMAPI read( + RCODE FTKAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - RCODE FLMAPI write( + RCODE FTKAPI write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten); - FINLINE RCODE FLMAPI socketPeekWrite( + FINLINE RCODE FTKAPI socketPeekWrite( FLMUINT uiTimeOut) { return( f_socketPeek( m_iSocket, uiTimeOut, FALSE)); } - FINLINE RCODE FLMAPI f_socketPeekRead( + FINLINE RCODE FTKAPI f_socketPeekRead( FLMUINT uiTimeOut) { return( f_socketPeek( m_iSocket, uiTimeOut, TRUE)); }; - FINLINE const char * FLMAPI getLocalHostName( void) + FINLINE const char * FTKAPI getLocalHostName( void) { getLocalInfo(); return( (const char *)m_pszName); }; - FINLINE const char * FLMAPI getLocalHostAddress( void) + FINLINE const char * FTKAPI getLocalHostAddress( void) { getLocalInfo(); return( (const char *)m_pszIp); }; - FINLINE const char * FLMAPI getPeerHostName( void) + FINLINE const char * FTKAPI getPeerHostName( void) { getRemoteInfo(); return( (const char *)m_pszPeerName); }; - FINLINE const char * FLMAPI getPeerHostAddress( void) + FINLINE const char * FTKAPI getPeerHostAddress( void) { getRemoteInfo(); return( (const char *)m_pszPeerIp); }; - RCODE FLMAPI readNoWait( + RCODE FTKAPI readNoWait( void * pvBuffer, FLMUINT uiCount, FLMUINT * puiReadRead); - RCODE FLMAPI readAll( + RCODE FTKAPI readAll( void * pvBuffer, FLMUINT uiCount, FLMUINT * puiBytesRead); - void FLMAPI setIOTimeout( + void FTKAPI setIOTimeout( FLMUINT uiSeconds); - RCODE FLMAPI closeStream( void); + RCODE FTKAPI closeStream( void); private: @@ -197,24 +197,24 @@ public: closeStream(); } - RCODE FLMAPI openStream( + RCODE FTKAPI openStream( const char * pszHost, FLMUINT uiPort = 443, FLMUINT uiFlags = 0); - RCODE FLMAPI read( + RCODE FTKAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead = NULL); - RCODE FLMAPI write( + RCODE FTKAPI write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten = NULL); - const char * FLMAPI getPeerCertificateText( void); + const char * FTKAPI getPeerCertificateText( void); - RCODE FLMAPI closeStream( void); + RCODE FTKAPI closeStream( void); private: @@ -379,7 +379,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmOpenTCPIOStream( +RCODE FTKAPI FlmOpenTCPIOStream( const char * pszHost, FLMUINT uiPort, FLMUINT uiFlags, @@ -417,7 +417,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmAllocSSLIOStream( +RCODE FTKAPI FlmAllocSSLIOStream( IF_IOStream ** ppIOStream) { #ifdef FLM_OPENSSL @@ -440,7 +440,7 @@ RCODE FLMAPI FlmAllocSSLIOStream( /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmOpenSSLIOStream( +RCODE FTKAPI FlmOpenSSLIOStream( const char * pszHost, FLMUINT uiPort, FLMUINT uiFlags, @@ -822,7 +822,7 @@ RCODE F_TCPIOStream::getRemoteInfo( void) /******************************************************************** Desc: *********************************************************************/ -RCODE FLMAPI F_TCPIOStream::write( +RCODE FTKAPI F_TCPIOStream::write( const void * pucBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten) @@ -918,7 +918,7 @@ Exit: /******************************************************************** Desc: *********************************************************************/ -RCODE FLMAPI F_TCPIOStream::read( +RCODE FTKAPI F_TCPIOStream::read( void * pucBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesRead) @@ -1086,7 +1086,7 @@ Exit: /******************************************************************** Desc: Closes any open connections *********************************************************************/ -RCODE FLMAPI F_TCPIOStream::closeStream( void) +RCODE FTKAPI F_TCPIOStream::closeStream( void) { if( m_iSocket == INVALID_SOCKET) { @@ -1104,7 +1104,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_TCPIOStream::setIOTimeout( +void FTKAPI F_TCPIOStream::setIOTimeout( FLMUINT uiSeconds) { m_uiIOTimeout = uiSeconds; @@ -1114,7 +1114,7 @@ void FLMAPI F_TCPIOStream::setIOTimeout( Desc: ****************************************************************************/ #ifdef FLM_OPENSSL -RCODE FLMAPI F_SSLIOStream::openStream( +RCODE FTKAPI F_SSLIOStream::openStream( const char * pszHost, FLMUINT uiPort, FLMUINT uiFlags) @@ -1273,7 +1273,7 @@ Exit: Desc: ****************************************************************************/ #ifdef FLM_OPENSSL -RCODE FLMAPI F_SSLIOStream::read( +RCODE FTKAPI F_SSLIOStream::read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead) @@ -1316,7 +1316,7 @@ Exit: Desc: ****************************************************************************/ #ifdef FLM_OPENSSL -RCODE FLMAPI F_SSLIOStream::write( +RCODE FTKAPI F_SSLIOStream::write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten) @@ -1351,7 +1351,7 @@ Exit: Desc: ****************************************************************************/ #ifdef FLM_OPENSSL -RCODE FLMAPI F_SSLIOStream::closeStream( void) +RCODE FTKAPI F_SSLIOStream::closeStream( void) { if( m_pBio) { @@ -1387,7 +1387,7 @@ RCODE FLMAPI F_SSLIOStream::closeStream( void) Desc: ******************************************************************************/ #ifdef FLM_OPENSSL -const char * FLMAPI F_SSLIOStream::getPeerCertificateText( void) +const char * FTKAPI F_SSLIOStream::getPeerCertificateText( void) { return( m_pszPeerCertText); } @@ -1474,7 +1474,7 @@ void f_closeSocket( /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmOpenTCPListener( +RCODE FTKAPI FlmOpenTCPListener( FLMBYTE * pucBindAddr, FLMUINT uiBindPort, IF_TCPListener ** ppListener) diff --git a/ftk/src/ftknlm.cpp b/ftk/src/ftknlm.cpp index 8c14bac..7a32758 100644 --- a/ftk/src/ftknlm.cpp +++ b/ftk/src/ftknlm.cpp @@ -1535,7 +1535,7 @@ Exit: Desc: Close a file ****************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI F_FileHdl::closeFile( void) +RCODE FTKAPI F_FileHdl::closeFile( void) { if( m_bNSS) { @@ -1612,7 +1612,7 @@ RCODE FLMAPI F_FileHdl::closeFile( void) Desc: Return the size of the file ****************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI F_FileHdl::size( +RCODE FTKAPI F_FileHdl::size( FLMUINT64 * pui64Size) { RCODE rc = NE_FLM_OK; @@ -1658,7 +1658,7 @@ WARNING: Direct IO methods are calling this method. Make sure that all changes to this method work in direct IO mode. ****************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI F_FileHdl::truncateFile( +RCODE FTKAPI F_FileHdl::truncateFile( FLMUINT64 ui64Size) { RCODE rc = NE_FLM_OK; @@ -1982,7 +1982,7 @@ RCODE F_FileHdl::flush( void) Desc: ****************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI F_FileHdl::lock( void) +RCODE FTKAPI F_FileHdl::lock( void) { return( RC_SET_AND_ASSERT( NE_FLM_NOT_IMPLEMENTED)); } @@ -1992,7 +1992,7 @@ RCODE FLMAPI F_FileHdl::lock( void) Desc: ****************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI F_FileHdl::unlock( void) +RCODE FTKAPI F_FileHdl::unlock( void) { return( RC_SET_AND_ASSERT( NE_FLM_NOT_IMPLEMENTED)); } @@ -2495,7 +2495,7 @@ FSTATIC void ConvertToQualifiedNWPath( Desc: ****************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -void FLMAPI f_yieldCPU( void) +void FTKAPI f_yieldCPU( void) { kYieldIfTimeSliceUp(); } @@ -2588,7 +2588,7 @@ void * f_getNLMHandle( void) Desc: **********************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI f_chdir( +RCODE FTKAPI f_chdir( const char * pszDir) { F_UNREFERENCED_PARM( pszDir); @@ -2600,7 +2600,7 @@ RCODE FLMAPI f_chdir( Desc: **********************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI f_getcwd( +RCODE FTKAPI f_getcwd( char * pszDir) { *pszDir = NULL; diff --git a/ftk/src/ftkntab.cpp b/ftk/src/ftkntab.cpp index c0dc59b..722e54a 100644 --- a/ftk/src/ftkntab.cpp +++ b/ftk/src/ftkntab.cpp @@ -72,10 +72,10 @@ public: virtual ~F_NameTable(); - void FLMAPI clearTable( + void FTKAPI clearTable( FLMUINT uiPoolBlkSize); - RCODE FLMAPI getNextTagTypeAndNumOrder( + RCODE FTKAPI getNextTagTypeAndNumOrder( FLMUINT uiType, FLMUINT * puiNextPos, FLMUNICODE * puzTagName = NULL, @@ -87,7 +87,7 @@ public: FLMUINT uiNamespaceBufSize = 0, FLMBOOL bTruncatedNamesOk = TRUE); - RCODE FLMAPI getNextTagTypeAndNameOrder( + RCODE FTKAPI getNextTagTypeAndNameOrder( FLMUINT uiType, FLMUINT * puiNextPos, FLMUNICODE * puzTagName = NULL, @@ -99,7 +99,7 @@ public: FLMUINT uiNamespaceBufSize = 0, FLMBOOL bTruncatedNamesOk = TRUE); - RCODE FLMAPI getFromTagTypeAndName( + RCODE FTKAPI getFromTagTypeAndName( FLMUINT uiType, const FLMUNICODE * puzTagName, const char * pszTagName, @@ -108,7 +108,7 @@ public: FLMUINT * puiTagNum = NULL, FLMUINT * puiDataType = NULL); - RCODE FLMAPI getFromTagTypeAndNum( + RCODE FTKAPI getFromTagTypeAndNum( FLMUINT uiType, FLMUINT uiTagNum, FLMUNICODE * puzTagName = NULL, @@ -120,7 +120,7 @@ public: FLMUINT * puiNamespaceBufSize = NULL, FLMBOOL bTruncatedNamesOk = TRUE); - RCODE FLMAPI addTag( + RCODE FTKAPI addTag( FLMUINT uiType, FLMUNICODE * puzTagName, const char * pszTagName, @@ -129,16 +129,16 @@ public: FLMUNICODE * puzNamespace = NULL, FLMBOOL bCheckDuplicates = TRUE); - void FLMAPI removeTag( + void FTKAPI removeTag( FLMUINT uiType, FLMUINT uiTagNum); - RCODE FLMAPI cloneNameTable( + RCODE FTKAPI cloneNameTable( IF_NameTable ** ppNewNameTable); - FLMINT FLMAPI AddRef( void); + FLMINT FTKAPI AddRef( void); - FLMINT FLMAPI Release( void); + FLMINT FTKAPI Release( void); private: @@ -236,7 +236,7 @@ F_NameTable::~F_NameTable() /**************************************************************************** Desc: Free everything in the table ****************************************************************************/ -void FLMAPI F_NameTable::clearTable( +void FTKAPI F_NameTable::clearTable( FLMUINT uiPoolBlkSize) { m_pool.poolFree(); @@ -1259,7 +1259,7 @@ Desc: Get a tag name, number, etc. using type + tag number ordering. non-NULL UNICODE string is passed in, it will be used. Otherwise, the NATIVE string will be used. ****************************************************************************/ -RCODE FLMAPI F_NameTable::getNextTagTypeAndNumOrder( +RCODE FTKAPI F_NameTable::getNextTagTypeAndNumOrder( FLMUINT uiType, FLMUINT * puiNextPos, FLMUNICODE * puzTagName, // May be NULL @@ -1348,7 +1348,7 @@ Desc: Get a tag name, number, etc. using type + tag name ordering. non-NULL UNICODE string is passed in, it will be used. Otherwise, the NATIVE string will be used. ****************************************************************************/ -RCODE FLMAPI F_NameTable::getNextTagTypeAndNameOrder( +RCODE FTKAPI F_NameTable::getNextTagTypeAndNameOrder( FLMUINT uiType, FLMUINT * puiNextPos, FLMUNICODE * puzTagName, // May be NULL @@ -1436,7 +1436,7 @@ Desc: Get a tag name from its tag type and number. Tag name is returned as a UNICODE string or NATIVE string. If a non-NULL UNICODE string is passed in, it will be used. Otherwise, the NATIVE string will be used. ****************************************************************************/ -RCODE FLMAPI F_NameTable::getFromTagTypeAndNum( +RCODE FTKAPI F_NameTable::getFromTagTypeAndNum( FLMUINT uiType, FLMUINT uiTagNum, FLMUNICODE * puzTagName, // May be NULL @@ -1516,7 +1516,7 @@ Desc: Get a tag number from its tag name and type. Tag name is passed passed in, it will be used. Otherwise, the NATIVE string will be used. ****************************************************************************/ -RCODE FLMAPI F_NameTable::getFromTagTypeAndName( +RCODE FTKAPI F_NameTable::getFromTagTypeAndName( FLMUINT uiType, const FLMUNICODE * puzTagName, const char * pszTagName, @@ -1635,7 +1635,7 @@ Desc: Add a tag to the table. Tag name is passed in as a UNICODE string or NATIVE string. If a non-NULL UNICODE string is passed in, it will be used. Otherwise, the NATIVE string will be used. ****************************************************************************/ -RCODE FLMAPI F_NameTable::addTag( +RCODE FTKAPI F_NameTable::addTag( FLMUINT uiType, FLMUNICODE * puzTagName, const char * pszTagName, @@ -1746,7 +1746,7 @@ void F_NameTable::sortTags( void) /**************************************************************************** Desc: Remove a tag from the table ****************************************************************************/ -void FLMAPI F_NameTable::removeTag( +void FTKAPI F_NameTable::removeTag( FLMUINT uiType, FLMUINT uiTagNum) { @@ -1802,7 +1802,7 @@ void FLMAPI F_NameTable::removeTag( /**************************************************************************** Desc: Create a clone of this name table ****************************************************************************/ -RCODE FLMAPI F_NameTable::cloneNameTable( +RCODE FTKAPI F_NameTable::cloneNameTable( IF_NameTable ** ppNewNameTable) { RCODE rc = NE_FLM_OK; @@ -1870,7 +1870,7 @@ Exit: /**************************************************************************** Desc: Increment use count on this object. ****************************************************************************/ -FLMINT FLMAPI F_NameTable::AddRef( void) +FLMINT FTKAPI F_NameTable::AddRef( void) { return( f_atomicInc( &m_refCnt)); } @@ -1878,7 +1878,7 @@ FLMINT FLMAPI F_NameTable::AddRef( void) /**************************************************************************** Desc: Decrement the use count and delete if use count goes to zero. ****************************************************************************/ -FLMINT FLMAPI F_NameTable::Release( void) +FLMINT FTKAPI F_NameTable::Release( void) { FLMINT iRefCnt; diff --git a/ftk/src/ftkprntf.cpp b/ftk/src/ftkprntf.cpp index 1259a4e..5262baf 100644 --- a/ftk/src/ftkprntf.cpp +++ b/ftk/src/ftkprntf.cpp @@ -41,14 +41,14 @@ public: { } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar) { *m_pszDestBuffer++ = cChar; return( 1); } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar, FLMUINT uiCount) { @@ -58,7 +58,7 @@ public: return( (FLMINT)uiCount); } - FINLINE FLMINT FLMAPI outputStr( + FINLINE FLMINT FTKAPI outputStr( const char * pszStr, FLMUINT uiLen) { @@ -68,7 +68,7 @@ public: return( (FLMINT)uiLen); } - FINLINE FLMINT FLMAPI colorFormatter( + FINLINE FLMINT FTKAPI colorFormatter( char, // cFormatChar, eColorType, // eColor, FLMUINT) // uiFlags) @@ -96,14 +96,14 @@ public: { } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar) { m_dynaBuf.appendByte( cChar); return( 1); } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar, FLMUINT uiCount) { @@ -118,7 +118,7 @@ public: return( iBytesOutput); } - FINLINE FLMINT FLMAPI outputStr( + FINLINE FLMINT FTKAPI outputStr( const char * pszStr, FLMUINT uiLen) { @@ -126,7 +126,7 @@ public: return( (FLMINT)uiLen); } - FINLINE FLMINT FLMAPI colorFormatter( + FINLINE FLMINT FTKAPI colorFormatter( char, // cFormatChar, eColorType, // eColor, FLMUINT) // uiFlags) @@ -160,14 +160,14 @@ public: { } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar) { fprintf( stdout, "%c", cChar); return( 1); } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar, FLMUINT uiCount) { @@ -182,7 +182,7 @@ public: return( iBytesOutput); } - FINLINE FLMINT FLMAPI outputStr( + FINLINE FLMINT FTKAPI outputStr( const char * pszStr, FLMUINT uiLen) { @@ -190,7 +190,7 @@ public: return( (FLMINT)uiLen); } - FINLINE FLMINT FLMAPI colorFormatter( + FINLINE FLMINT FTKAPI colorFormatter( char, // cFormatChar, eColorType, // eColor, FLMUINT) // uiFlags) @@ -214,14 +214,14 @@ public: { } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar) { fprintf( stderr, "%c", cChar); return( 1); } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar, FLMUINT uiCount) { @@ -236,7 +236,7 @@ public: return( iBytesOutput); } - FINLINE FLMINT FLMAPI outputStr( + FINLINE FLMINT FTKAPI outputStr( const char * pszStr, FLMUINT uiLen) { @@ -244,7 +244,7 @@ public: return( (FLMINT)uiLen); } - FINLINE FLMINT FLMAPI colorFormatter( + FINLINE FLMINT FTKAPI colorFormatter( char, // cFormatChar, eColorType, // eColor, FLMUINT) // uiFlags) @@ -903,7 +903,7 @@ void F_Printf::notHandledFormatter( void) /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_printf( +FLMINT FTKAPI f_printf( IF_PrintfClient * pClient, const char * pszFormat, ...) @@ -922,7 +922,7 @@ FLMINT FLMAPI f_printf( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_vprintf( +FLMINT FTKAPI f_vprintf( IF_PrintfClient * pClient, const char * pszFormat, f_va_list * args) @@ -935,7 +935,7 @@ FLMINT FLMAPI f_vprintf( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_vsprintf( +FLMINT FTKAPI f_vsprintf( char * pszDestBuffer, const char * pszFormat, f_va_list * args) @@ -952,7 +952,7 @@ FLMINT FLMAPI f_vsprintf( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_sprintf( +FLMINT FTKAPI f_sprintf( char * pszDestBuffer, const char * pszFormat, ...) @@ -972,7 +972,7 @@ FLMINT FLMAPI f_sprintf( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_printf( +FLMINT FTKAPI f_printf( const char * pszFormat, ...) { @@ -995,7 +995,7 @@ FLMINT FLMAPI f_printf( /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI f_errprintf( +FLMINT FTKAPI f_errprintf( const char * pszFormat, ...) { @@ -1018,7 +1018,7 @@ FLMINT FLMAPI f_errprintf( /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmAllocStdoutPrintfClient( +RCODE FTKAPI FlmAllocStdoutPrintfClient( IF_PrintfClient ** ppClient) { if( (*ppClient = f_new F_StdoutPrintfClient) == NULL) @@ -1032,7 +1032,7 @@ RCODE FLMAPI FlmAllocStdoutPrintfClient( /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmAllocStderrPrintfClient( +RCODE FTKAPI FlmAllocStderrPrintfClient( IF_PrintfClient ** ppClient) { if( (*ppClient = f_new F_StderrPrintfClient) == NULL) diff --git a/ftk/src/ftkrand.cpp b/ftk/src/ftkrand.cpp index c175d70..acce86b 100644 --- a/ftk/src/ftkrand.cpp +++ b/ftk/src/ftkrand.cpp @@ -69,20 +69,20 @@ class F_RandomGenerator : public IF_RandomGenerator { public: - void FLMAPI randomize( void); + void FTKAPI randomize( void); - void FLMAPI setSeed( + void FTKAPI setSeed( FLMUINT32 ui32seed); - FLMUINT32 FLMAPI getUINT32( void); + FLMUINT32 FTKAPI getUINT32( void); - FLMUINT32 FLMAPI getUINT32( + FLMUINT32 FTKAPI getUINT32( FLMUINT32 ui32Low, FLMUINT32 ui32High); - FLMBOOL FLMAPI getBoolean( void); + FLMBOOL FTKAPI getBoolean( void); - FLMUINT32 FLMAPI getSeed( void) + FLMUINT32 FTKAPI getSeed( void) { return( m_ui32Seed); } @@ -95,7 +95,7 @@ private: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocRandomGenerator( +RCODE FTKAPI FlmAllocRandomGenerator( IF_RandomGenerator ** ppRandomGenerator) { if( (*ppRandomGenerator = f_new F_RandomGenerator) == NULL) diff --git a/ftk/src/ftkrset.cpp b/ftk/src/ftkrset.cpp index 3532b3b..8f67289 100644 --- a/ftk/src/ftkrset.cpp +++ b/ftk/src/ftkrset.cpp @@ -348,7 +348,7 @@ public: virtual ~F_ResultSet(); - RCODE FLMAPI setupResultSet( + RCODE FTKAPI setupResultSet( const char * pszPath, IF_ResultSetCompare * pCompare, FLMUINT uiEntrySize, @@ -356,7 +356,7 @@ public: FLMBOOL bEntriesInOrder = FALSE, const char * pszInputFileName = NULL); - FINLINE FLMUINT64 FLMAPI getTotalEntries( void) + FINLINE FLMUINT64 FTKAPI getTotalEntries( void) { F_ResultSetBlk * pBlk = m_pFirstRSBlk; FLMUINT64 ui64TotalEntries = 0; @@ -369,47 +369,47 @@ public: return( ui64TotalEntries); } - RCODE FLMAPI addEntry( + RCODE FTKAPI addEntry( const void * pvEntry, FLMUINT uiEntryLength = 0); - RCODE FLMAPI finalizeResultSet( + RCODE FTKAPI finalizeResultSet( IF_ResultSetSortStatus * pSortStatus = NULL, FLMUINT64 * pui64TotalEntries = NULL); - RCODE FLMAPI getFirst( + RCODE FTKAPI getFirst( void * pvEntryBuffer, FLMUINT uiBufferLength = 0, FLMUINT * puiEntryLength = NULL); - RCODE FLMAPI getNext( + RCODE FTKAPI getNext( void * pvEntryBuffer, FLMUINT uiBufferLength = 0, FLMUINT * puiEntryLength = NULL); - RCODE FLMAPI getLast( + RCODE FTKAPI getLast( void * pvEntryBuffer, FLMUINT uiBufferLength = 0, FLMUINT * puiEntryLength = NULL); - RCODE FLMAPI getPrev( + RCODE FTKAPI getPrev( void * pvEntryBuffer, FLMUINT uiBufferLength = 0, FLMUINT * puiEntryLength = NULL); - RCODE FLMAPI getCurrent( + RCODE FTKAPI getCurrent( void * pvEntryBuffer, FLMUINT uiBufferLength = 0, FLMUINT * puiEntryLength = NULL); - FINLINE RCODE FLMAPI modifyCurrent( + FINLINE RCODE FTKAPI modifyCurrent( const void * pvEntry, FLMUINT uiEntryLength = 0) { return( m_pCurRSBlk->modifyEntry( (FLMBYTE *)pvEntry, uiEntryLength)); } - FINLINE RCODE FLMAPI findMatch( + FINLINE RCODE FTKAPI findMatch( const void * pvMatchEntry, void * pvFoundEntry) { @@ -417,26 +417,26 @@ public: pvFoundEntry, NULL)); } - RCODE FLMAPI findMatch( + RCODE FTKAPI findMatch( const void * pvMatchEntry, FLMUINT uiMatchEntryLength, void * pvFoundEntry, FLMUINT * puiFoundEntryLength); - FINLINE FLMUINT64 FLMAPI getPosition( void) + FINLINE FLMUINT64 FTKAPI getPosition( void) { return( (!m_pCurRSBlk ? RS_POSITION_NOT_SET : m_pCurRSBlk->getPosition())); } - RCODE FLMAPI setPosition( + RCODE FTKAPI setPosition( FLMUINT64 ui64Position); - RCODE FLMAPI resetResultSet( + RCODE FTKAPI resetResultSet( FLMBOOL bDelete = TRUE); - RCODE FLMAPI flushToFile( void); + RCODE FTKAPI flushToFile( void); private: @@ -539,26 +539,26 @@ public: RCODE setupResultSet( IF_ResultSetCompare * pCompare); - RCODE FLMAPI addEntry( + RCODE FTKAPI addEntry( FLMBYTE * pucKey, FLMUINT uiKeyLength, FLMBYTE * pucEntry, FLMUINT uiEntryLength); - RCODE FLMAPI modifyEntry( + RCODE FTKAPI modifyEntry( FLMBYTE * pucKey, FLMUINT uiKeyLength, FLMBYTE * pucEntry, FLMUINT uiEntryLength); - RCODE FLMAPI getCurrent( + RCODE FTKAPI getCurrent( FLMBYTE * pucKey, FLMUINT uiKeyLength, FLMBYTE * pucEntry, FLMUINT uiEntryLength, FLMUINT * puiReturnLength); - RCODE FLMAPI getNext( + RCODE FTKAPI getNext( FLMBYTE * pucKey, FLMUINT uiKeyBufLen, FLMUINT * puiKeylen, @@ -566,7 +566,7 @@ public: FLMUINT uiBufferLength, FLMUINT * puiReturnLength); - RCODE FLMAPI getPrev( + RCODE FTKAPI getPrev( FLMBYTE * pucKey, FLMUINT uiKeyBufLen, FLMUINT * puiKeylen, @@ -574,7 +574,7 @@ public: FLMUINT uiBufferLength, FLMUINT * puiReturnLength); - RCODE FLMAPI getFirst( + RCODE FTKAPI getFirst( FLMBYTE * pucKey, FLMUINT uiKeyBufLen, FLMUINT * puiKeylen, @@ -582,7 +582,7 @@ public: FLMUINT uiBufferLength, FLMUINT * puiReturnLength); - RCODE FLMAPI getLast( + RCODE FTKAPI getLast( FLMBYTE * pucKey, FLMUINT uiKeyBufLen, FLMUINT * puiKeylen, @@ -590,14 +590,14 @@ public: FLMUINT uiBufferLength, FLMUINT * puiReturnLength); - RCODE FLMAPI findEntry( + RCODE FTKAPI findEntry( FLMBYTE * pucKey, FLMUINT uiKeyLen, FLMBYTE * pucBuffer, FLMUINT uiBufferLength, FLMUINT * puiReturnLength); - RCODE FLMAPI deleteEntry( + RCODE FTKAPI deleteEntry( FLMBYTE * pucKey, FLMUINT uiKeyLength); @@ -723,7 +723,7 @@ F_ResultSet::~F_ResultSet() /***************************************************************************** Desc: Reset the result set so it can be reused. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::resetResultSet( +RCODE FTKAPI F_ResultSet::resetResultSet( FLMBOOL bDelete) { RCODE rc = NE_FLM_OK; @@ -818,7 +818,7 @@ Exit: Desc: Setup the result set with all of the needed input values. This method must only be called once. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::setupResultSet( +RCODE FTKAPI F_ResultSet::setupResultSet( const char * pszDirPath, IF_ResultSetCompare * pCompare, FLMUINT uiEntrySize, @@ -1117,7 +1117,7 @@ Exit: Desc: Write the current block and close the file. Call this function befor calling resetResultSet so that it can be reused. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::flushToFile() +RCODE FTKAPI F_ResultSet::flushToFile() { RCODE rc = NE_FLM_OK; @@ -1146,7 +1146,7 @@ Notes: Public method used by application and by the internal sort and merge steps during finalize. The user must never add an entry that is larger than the block size. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::addEntry( +RCODE FTKAPI F_ResultSet::addEntry( const void * pvEntry, FLMUINT uiEntryLength) // If zero then entry is fixed length { @@ -1251,7 +1251,7 @@ Exit: /***************************************************************************** Desc: Done adding entries. Sort all of the entries and perform a merge. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::finalizeResultSet( +RCODE FTKAPI F_ResultSet::finalizeResultSet( IF_ResultSetSortStatus * pSortStatus, FLMUINT64 * pui64TotalEntries) { @@ -1626,7 +1626,7 @@ Exit: /***************************************************************************** Desc: Return the Current entry reference in the result set. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::getCurrent( +RCODE FTKAPI F_ResultSet::getCurrent( void * pvBuffer, FLMUINT uiBufferLength, FLMUINT * puiReturnLength) @@ -1652,7 +1652,7 @@ RCODE FLMAPI F_ResultSet::getCurrent( Desc: Return the next reference in the result set. If the result set is not positioned then the first entry will be returned. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::getNext( +RCODE FTKAPI F_ResultSet::getNext( void * pvBuffer, FLMUINT uiBufferLength, FLMUINT * puiReturnLength) @@ -1712,7 +1712,7 @@ Exit: Desc: Return the previous reference in the result set. If the result set is not positioned then the last entry will be returned. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::getPrev( +RCODE FTKAPI F_ResultSet::getPrev( void * pvBuffer, FLMUINT uiBufferLength, FLMUINT * puiReturnLength) @@ -1770,7 +1770,7 @@ Exit: /***************************************************************************** Desc: Return the first reference in the result set. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::getFirst( +RCODE FTKAPI F_ResultSet::getFirst( void * pvBuffer, FLMUINT uiBufferLength, FLMUINT * puiReturnLength) @@ -1813,7 +1813,7 @@ Exit: /***************************************************************************** Desc: Return the last reference in the result set. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::getLast( +RCODE FTKAPI F_ResultSet::getLast( void * pvBuffer, FLMUINT uiBufferLength, FLMUINT * puiReturnLength) @@ -1857,7 +1857,7 @@ Exit: Desc: Find the matching entry in the result set using the compare routine. This does a binary search on the list of blocks. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::findMatch( +RCODE FTKAPI F_ResultSet::findMatch( const void * pvMatchEntry, // Entry to match FLMUINT uiMatchEntryLength, // Variable length of above entry void * pvFoundEntry, // (out) Entry to return @@ -2039,7 +2039,7 @@ Exit: /***************************************************************************** Desc: Set the current entry position. *****************************************************************************/ -RCODE FLMAPI F_ResultSet::setPosition( +RCODE FTKAPI F_ResultSet::setPosition( FLMUINT64 ui64Position) { RCODE rc = NE_FLM_OK; @@ -4151,7 +4151,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocResultSet( +RCODE FTKAPI FlmAllocResultSet( IF_ResultSet ** ppResultSet) { if( (*ppResultSet = f_new F_ResultSet) == NULL) @@ -4165,7 +4165,7 @@ RCODE FLMAPI FlmAllocResultSet( /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmAllocBTreeResultSet( +RCODE FTKAPI FlmAllocBTreeResultSet( IF_ResultSetCompare * pCompare, IF_BTreeResultSet ** ppBTreeResultSet) { diff --git a/ftk/src/ftksem.cpp b/ftk/src/ftksem.cpp index 05391b3..e19893a 100644 --- a/ftk/src/ftksem.cpp +++ b/ftk/src/ftksem.cpp @@ -63,7 +63,7 @@ typedef struct Desc: ****************************************************************************/ #if defined( FLM_WIN) -RCODE FLMAPI f_mutexCreate( +RCODE FTKAPI f_mutexCreate( F_MUTEX * phMutex) { f_assert( phMutex != NULL); @@ -88,7 +88,7 @@ RCODE FLMAPI f_mutexCreate( Desc: ****************************************************************************/ #if defined( FLM_WIN) -void FLMAPI f_mutexDestroy( +void FTKAPI f_mutexDestroy( F_MUTEX * phMutex) { f_assert( phMutex != NULL); @@ -105,7 +105,7 @@ void FLMAPI f_mutexDestroy( Desc: ****************************************************************************/ #if (defined( FLM_UNIX) || defined( FLM_LIBC_NLM)) && !defined( FLM_SOLARIS) -RCODE FLMAPI f_mutexCreate( +RCODE FTKAPI f_mutexCreate( F_MUTEX * phMutex) { RCODE rc = NE_FLM_OK; @@ -162,7 +162,7 @@ Exit: Desc: ****************************************************************************/ #if defined( FLM_SOLARIS) -RCODE FLMAPI f_mutexCreate( +RCODE FTKAPI f_mutexCreate( F_MUTEX * phMutex) { RCODE rc = NE_FLM_OK; @@ -191,7 +191,7 @@ Exit: Desc: ****************************************************************************/ #if (defined( FLM_UNIX) || defined( FLM_LIBC_NLM)) && !defined( FLM_SOLARIS) -void FLMAPI f_mutexDestroy( +void FTKAPI f_mutexDestroy( F_MUTEX * phMutex) { f_assert( phMutex != NULL); @@ -214,7 +214,7 @@ void FLMAPI f_mutexDestroy( Desc: ****************************************************************************/ #if defined( FLM_SOLARIS) -void FLMAPI f_mutexDestroy( +void FTKAPI f_mutexDestroy( F_MUTEX * phMutex) { f_assert( phMutex != NULL); @@ -231,7 +231,7 @@ void FLMAPI f_mutexDestroy( Desc: ****************************************************************************/ #if (defined( FLM_UNIX) || defined( FLM_LIBC_NLM)) && !defined( FLM_SOLARIS) -void FLMAPI f_mutexLock( +void FTKAPI f_mutexLock( F_MUTEX hMutex) { (void)pthread_mutex_lock( (pthread_mutex_t *)hMutex); @@ -242,7 +242,7 @@ void FLMAPI f_mutexLock( Desc: ****************************************************************************/ #if defined( FLM_SOLARIS) -void FLMAPI f_mutexLock( +void FTKAPI f_mutexLock( F_MUTEX hMutex) { for( ;;) @@ -259,7 +259,7 @@ void FLMAPI f_mutexLock( Desc: ****************************************************************************/ #if (defined( FLM_UNIX) || defined( FLM_LIBC_NLM)) && !defined( FLM_SOLARIS) -void FLMAPI f_mutexUnlock( +void FTKAPI f_mutexUnlock( F_MUTEX hMutex) { (void)pthread_mutex_unlock( (pthread_mutex_t *)hMutex); @@ -270,7 +270,7 @@ void FLMAPI f_mutexUnlock( Desc: ****************************************************************************/ #if defined( FLM_SOLARIS) -void FLMAPI f_mutexUnlock( +void FTKAPI f_mutexUnlock( F_MUTEX hMutex) { _lwp_mutex_unlock( (lwp_mutex_t *)hMutex); @@ -284,7 +284,7 @@ void FLMAPI f_mutexUnlock( Desc: ****************************************************************************/ #if defined( FLM_UNIX) || defined( FLM_NLM) -void FLMAPI f_assertMutexLocked( +void FTKAPI f_assertMutexLocked( F_MUTEX) { } @@ -294,7 +294,7 @@ void FLMAPI f_assertMutexLocked( Desc: ****************************************************************************/ #if defined( FLM_UNIX) || defined( FLM_NLM) -void FLMAPI f_assertMutexNotLocked( +void FTKAPI f_assertMutexNotLocked( F_MUTEX) { } @@ -304,7 +304,7 @@ void FLMAPI f_assertMutexNotLocked( Desc: ****************************************************************************/ #ifdef FLM_WIN -void FLMAPI f_assertMutexLocked( +void FTKAPI f_assertMutexLocked( F_MUTEX hMutex) { #ifdef FLM_DEBUG @@ -320,7 +320,7 @@ void FLMAPI f_assertMutexLocked( Desc: ****************************************************************************/ #ifdef FLM_WIN -void FLMAPI f_assertMutexNotLocked( +void FTKAPI f_assertMutexNotLocked( F_MUTEX hMutex) { #ifdef FLM_DEBUG @@ -335,7 +335,7 @@ void FLMAPI f_assertMutexNotLocked( Desc: *************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI f_mutexCreate( +RCODE FTKAPI f_mutexCreate( F_MUTEX * phMutex) { if( (*phMutex = (F_MUTEX)kMutexAlloc( (BYTE *)"FTK_MUTEX")) == F_MUTEX_NULL) @@ -351,7 +351,7 @@ RCODE FLMAPI f_mutexCreate( Desc: *************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -void FLMAPI f_mutexDestroy( +void FTKAPI f_mutexDestroy( F_MUTEX * phMutex) { if (*phMutex != F_MUTEX_NULL) @@ -366,7 +366,7 @@ void FLMAPI f_mutexDestroy( Desc: *************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -void FLMAPI f_mutexLock( +void FTKAPI f_mutexLock( F_MUTEX hMutex) { (void)kMutexLock( (MUTEX)hMutex); @@ -377,7 +377,7 @@ void FLMAPI f_mutexLock( Desc: *************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -void FLMAPI f_mutexUnlock( +void FTKAPI f_mutexUnlock( F_MUTEX hMutex) { (void)kMutexUnlock( (MUTEX)hMutex); @@ -704,7 +704,7 @@ RCODE f_semWait( Desc: Get the lock on a semaphore - p operation ****************************************************************************/ #if defined( FLM_UNIX) || defined( FLM_LIBC_NLM) -void FLMAPI f_semSignal( +void FTKAPI f_semSignal( F_SEM hSem) { #if defined( FLM_SOLARIS) @@ -719,7 +719,7 @@ void FLMAPI f_semSignal( Desc: ****************************************************************************/ #if defined( FLM_UNIX) || defined( FLM_LIBC_NLM) -FLMUINT FLMAPI f_semGetSignalCount( +FLMUINT FTKAPI f_semGetSignalCount( F_SEM hSem) { return( (FLMUINT)((sema_t *)hSem)->count); @@ -730,7 +730,7 @@ FLMUINT FLMAPI f_semGetSignalCount( Desc: *************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI f_semCreate( +RCODE FTKAPI f_semCreate( F_SEM * phSem) { if( (*phSem = (F_SEM)kSemaphoreAlloc( (BYTE *)"FTK_SEM", 0)) == F_SEM_NULL) @@ -746,7 +746,7 @@ RCODE FLMAPI f_semCreate( Desc: *************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -void FLMAPI f_semDestroy( +void FTKAPI f_semDestroy( F_SEM * phSem) { if (*phSem != F_SEM_NULL) @@ -761,7 +761,7 @@ void FLMAPI f_semDestroy( Desc: *************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI f_semWait( +RCODE FTKAPI f_semWait( F_SEM hSem, FLMUINT uiTimeout) { @@ -790,7 +790,7 @@ RCODE FLMAPI f_semWait( Desc: *************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -void FLMAPI f_semSignal( +void FTKAPI f_semSignal( F_SEM hSem) { (void)kSemaphoreSignal( (SEMAPHORE)hSem); @@ -801,7 +801,7 @@ void FLMAPI f_semSignal( Desc: ****************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -FLMUINT FLMAPI f_semGetSignalCount( +FLMUINT FTKAPI f_semGetSignalCount( F_SEM hSem) { return( (FLMUINT)kSemaphoreExamineCount( (SEMAPHORE)hSem)); @@ -812,7 +812,7 @@ FLMUINT FLMAPI f_semGetSignalCount( Desc: ****************************************************************************/ #ifdef FLM_WIN -void FLMAPI f_mutexLock( +void FTKAPI f_mutexLock( F_MUTEX hMutex) { F_INTERLOCK * pInterlock = (F_INTERLOCK *)hMutex; @@ -844,7 +844,7 @@ void FLMAPI f_mutexLock( Desc: ****************************************************************************/ #ifdef FLM_WIN -void FLMAPI f_mutexUnlock( +void FTKAPI f_mutexUnlock( F_MUTEX hMutex) { F_INTERLOCK * pInterlock = (F_INTERLOCK *)hMutex; @@ -862,7 +862,7 @@ void FLMAPI f_mutexUnlock( Desc: ****************************************************************************/ #ifdef FLM_WIN -RCODE FLMAPI f_semCreate( +RCODE FTKAPI f_semCreate( F_SEM * phSem) { RCODE rc = NE_FLM_OK; @@ -905,7 +905,7 @@ Exit: Desc: ****************************************************************************/ #ifdef FLM_WIN -void FLMAPI f_semDestroy( +void FTKAPI f_semDestroy( F_SEM * phSem) { sema_t * pSem = (sema_t *)(*phSem); @@ -928,7 +928,7 @@ void FLMAPI f_semDestroy( Desc: ****************************************************************************/ #ifdef FLM_WIN -RCODE FLMAPI f_semWait( +RCODE FTKAPI f_semWait( F_SEM hSem, FLMUINT uiTimeout) { @@ -961,7 +961,7 @@ RCODE FLMAPI f_semWait( Desc: ****************************************************************************/ #ifdef FLM_WIN -void FLMAPI f_semSignal( +void FTKAPI f_semSignal( F_SEM hSem) { f_atomicInc( &((sema_t *)hSem)->uiSignalCount); @@ -973,7 +973,7 @@ void FLMAPI f_semSignal( Desc: ****************************************************************************/ #ifdef FLM_WIN -FLMUINT FLMAPI f_semGetSignalCount( +FLMUINT FTKAPI f_semGetSignalCount( F_SEM hSem) { return( ((sema_t *)hSem)->uiSignalCount); @@ -1008,7 +1008,7 @@ FSTATIC void f_rwlockNotify( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_rwlockCreate( +RCODE FTKAPI f_rwlockCreate( F_RWLOCK * phReadWriteLock) { RCODE rc = NE_FLM_OK; @@ -1042,7 +1042,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_rwlockDestroy( +void FTKAPI f_rwlockDestroy( F_RWLOCK * phReadWriteLock) { F_RWLOCK_IMP * pReadWriteLock = (F_RWLOCK_IMP *)*phReadWriteLock; @@ -1063,7 +1063,7 @@ void FLMAPI f_rwlockDestroy( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_rwlockAcquire( +RCODE FTKAPI f_rwlockAcquire( F_RWLOCK hReadWriteLock, F_SEM hSem, FLMBOOL bWriter) @@ -1117,7 +1117,7 @@ RCODE FLMAPI f_rwlockAcquire( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_rwlockPromote( +RCODE FTKAPI f_rwlockPromote( F_RWLOCK hReadWriteLock, F_SEM hSem) { @@ -1164,7 +1164,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_rwlockTryAcquire( +RCODE FTKAPI f_rwlockTryAcquire( F_RWLOCK hReadWriteLock, FLMBOOL bWriter) { @@ -1206,7 +1206,7 @@ RCODE FLMAPI f_rwlockTryAcquire( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_rwlockRelease( +RCODE FTKAPI f_rwlockRelease( F_RWLOCK hReadWriteLock) { RCODE rc = NE_FLM_OK; @@ -1253,7 +1253,7 @@ Desc: This routine links a request into a notification list and then waits to be notified that the event has occurred. The mutex is assumed to protect the notify list. ****************************************************************************/ -RCODE FLMAPI f_notifyWait( +RCODE FTKAPI f_notifyWait( F_MUTEX hMutex, F_SEM hSem, void * pvData, @@ -1320,7 +1320,7 @@ Desc: This routine notifies threads waiting for a pending read or write to complete. This routine assumes that the notify list mutex is already locked. ****************************************************************************/ -void FLMAPI f_notifySignal( +void FTKAPI f_notifySignal( F_NOTIFY_LIST_ITEM * pNotifyList, RCODE notifyRc) { diff --git a/ftk/src/ftkstrm.cpp b/ftk/src/ftkstrm.cpp index 6fc8c3b..c8df6fd 100644 --- a/ftk/src/ftkstrm.cpp +++ b/ftk/src/ftkstrm.cpp @@ -121,7 +121,7 @@ public: } } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar, FLMUINT uiCount) { @@ -151,7 +151,7 @@ public: return( iBytesOutput); } - FINLINE FLMINT FLMAPI outputChar( + FINLINE FLMINT FTKAPI outputChar( char cChar) { m_szOutBuf[ m_uiBufOffset++] = cChar; @@ -164,7 +164,7 @@ public: return( 1); } - FINLINE FLMINT FLMAPI outputStr( + FINLINE FLMINT FTKAPI outputStr( const char * pszStr, FLMUINT uiLen) { @@ -195,7 +195,7 @@ public: return( iBytesOutput); } - FINLINE FLMINT FLMAPI colorFormatter( + FINLINE FLMINT FTKAPI colorFormatter( char, // cFormatChar, eColorType, // eColor, FLMUINT) // uiFlags) @@ -225,7 +225,7 @@ private: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmAllocBufferIStream( +RCODE FTKAPI FlmAllocBufferIStream( IF_BufferIStream ** ppIStream) { if( (*ppIStream = f_new F_BufferIStream) == NULL) @@ -239,7 +239,7 @@ RCODE FLMAPI FlmAllocBufferIStream( /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmOpenBufferIStream( +RCODE FTKAPI FlmOpenBufferIStream( const char * pucBuffer, FLMUINT uiLength, IF_PosIStream ** ppIStream) @@ -274,7 +274,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmOpenBase64EncoderIStream( +RCODE FTKAPI FlmOpenBase64EncoderIStream( IF_IStream * pSourceIStream, FLMBOOL bLineBreaks, IF_IStream ** ppIStream) @@ -309,7 +309,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmOpenBase64DecoderIStream( +RCODE FTKAPI FlmOpenBase64DecoderIStream( IF_IStream * pSourceIStream, IF_IStream ** ppIStream) { @@ -343,7 +343,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmOpenFileIStream( +RCODE FTKAPI FlmOpenFileIStream( const char * pszPath, IF_PosIStream ** ppIStream) { @@ -377,7 +377,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmOpenMultiFileIStream( +RCODE FTKAPI FlmOpenMultiFileIStream( const char * pszDirectory, const char * pszBaseName, IF_IStream ** ppIStream) @@ -412,7 +412,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmOpenBufferedIStream( +RCODE FTKAPI FlmOpenBufferedIStream( IF_IStream * pSourceIStream, FLMUINT uiBufferSize, IF_IStream ** ppIStream) @@ -447,7 +447,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmOpenUncompressingIStream( +RCODE FTKAPI FlmOpenUncompressingIStream( IF_IStream * pSourceIStream, IF_IStream ** ppIStream) { @@ -481,7 +481,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmOpenFileOStream( +RCODE FTKAPI FlmOpenFileOStream( const char * pszPath, FLMBOOL bTruncateIfExists, IF_OStream ** ppOStream) @@ -516,7 +516,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmOpenMultiFileOStream( +RCODE FTKAPI FlmOpenMultiFileOStream( const char * pszDirectory, const char * pszBaseName, FLMUINT uiMaxFileSize, @@ -554,7 +554,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmOpenBufferedOStream( +RCODE FTKAPI FlmOpenBufferedOStream( IF_OStream * pDestOStream, FLMUINT uiBufferSize, IF_OStream ** ppOStream) @@ -589,7 +589,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmOpenCompressingOStream( +RCODE FTKAPI FlmOpenCompressingOStream( IF_OStream * pDestOStream, IF_OStream ** ppOStream) { @@ -623,7 +623,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmRemoveMultiFileStream( +RCODE FTKAPI FlmRemoveMultiFileStream( const char * pszDirectory, const char * pszBaseName) { @@ -655,7 +655,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_FileIStream::openStream( +RCODE FTKAPI F_FileIStream::openStream( const char * pszFilePath) { RCODE rc = NE_FLM_OK; @@ -694,7 +694,7 @@ RCODE F_FileIStream::closeStream( void) /**************************************************************************** Desc: *****************************************************************************/ -FLMUINT64 FLMAPI F_FileIStream::totalSize( void) +FLMUINT64 FTKAPI F_FileIStream::totalSize( void) { FLMUINT64 ui64FileSize = 0; @@ -705,7 +705,7 @@ FLMUINT64 FLMAPI F_FileIStream::totalSize( void) /**************************************************************************** Desc: *****************************************************************************/ -FLMUINT64 FLMAPI F_FileIStream::remainingSize( void) +FLMUINT64 FTKAPI F_FileIStream::remainingSize( void) { FLMUINT64 ui64TotalSize = totalSize(); FLMUINT64 ui64Offset = getCurrPosition(); @@ -721,7 +721,7 @@ FLMUINT64 FLMAPI F_FileIStream::remainingSize( void) /**************************************************************************** Desc: *****************************************************************************/ -FLMUINT64 FLMAPI F_FileIStream::getCurrPosition( void) +FLMUINT64 FTKAPI F_FileIStream::getCurrPosition( void) { return( m_ui64FileOffset); } @@ -729,7 +729,7 @@ FLMUINT64 FLMAPI F_FileIStream::getCurrPosition( void) /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_FileIStream::positionTo( +RCODE FTKAPI F_FileIStream::positionTo( FLMUINT64 ui64Offset) { m_ui64FileOffset = ui64Offset; @@ -779,7 +779,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_BufferedIStream::openStream( +RCODE FTKAPI F_BufferedIStream::openStream( IF_IStream * pIStream, FLMUINT uiBufferSize) { @@ -816,7 +816,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_BufferedIStream::read( +RCODE FTKAPI F_BufferedIStream::read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead) @@ -880,7 +880,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_BufferedIStream::closeStream( void) +RCODE FTKAPI F_BufferedIStream::closeStream( void) { RCODE rc = NE_FLM_OK; @@ -910,7 +910,7 @@ RCODE FLMAPI F_BufferedIStream::closeStream( void) /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_FileOStream::openStream( +RCODE FTKAPI F_FileOStream::openStream( const char * pszFilePath, FLMBOOL bTruncateIfExists) { @@ -975,7 +975,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_FileOStream::write( +RCODE FTKAPI F_FileOStream::write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten) @@ -1010,7 +1010,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_FileOStream::closeStream( void) +RCODE FTKAPI F_FileOStream::closeStream( void) { RCODE rc = NE_FLM_OK; @@ -1027,7 +1027,7 @@ RCODE FLMAPI F_FileOStream::closeStream( void) /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_MultiFileIStream::openStream( +RCODE FTKAPI F_MultiFileIStream::openStream( const char * pszDirectory, const char * pszBaseName) { @@ -1144,7 +1144,7 @@ Exit: /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_MultiFileIStream::read( +RCODE FTKAPI F_MultiFileIStream::read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead) @@ -1217,7 +1217,7 @@ Exit: /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_MultiFileIStream::closeStream( void) +RCODE FTKAPI F_MultiFileIStream::closeStream( void) { if( m_pIStream) { @@ -1466,7 +1466,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_MultiFileOStream::write( +RCODE FTKAPI F_MultiFileOStream::write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten) @@ -1536,7 +1536,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_MultiFileOStream::closeStream( void) +RCODE FTKAPI F_MultiFileOStream::closeStream( void) { RCODE rc = NE_FLM_OK; @@ -1560,7 +1560,7 @@ RCODE FLMAPI F_MultiFileOStream::closeStream( void) /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_BufferedOStream::openStream( +RCODE FTKAPI F_BufferedOStream::openStream( IF_OStream * pOStream, FLMUINT uiBufferSize) { @@ -1591,7 +1591,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_BufferedOStream::flush( void) +RCODE FTKAPI F_BufferedOStream::flush( void) { RCODE rc = NE_FLM_OK; @@ -1613,7 +1613,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_BufferedOStream::write( +RCODE FTKAPI F_BufferedOStream::write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten) @@ -1658,7 +1658,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_BufferedOStream::closeStream( void) +RCODE FTKAPI F_BufferedOStream::closeStream( void) { RCODE rc = NE_FLM_OK; @@ -1698,7 +1698,7 @@ F_BufferIStream::~F_BufferIStream() /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_BufferIStream::openStream( +RCODE FTKAPI F_BufferIStream::openStream( const char * pucBuffer, FLMUINT uiLength, char ** ppucAllocatedBuffer) @@ -1738,7 +1738,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_BufferIStream::closeStream( void) +RCODE FTKAPI F_BufferIStream::closeStream( void) { if( m_bIsOpen) { @@ -1765,7 +1765,7 @@ RCODE FLMAPI F_BufferIStream::closeStream( void) /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_BufferIStream::read( +RCODE FTKAPI F_BufferIStream::read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead) @@ -1809,7 +1809,7 @@ Exit: /***************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_Base64DecoderIStream::openStream( +RCODE FTKAPI F_Base64DecoderIStream::openStream( IF_IStream * pIStream) { RCODE rc = NE_FLM_OK; @@ -1833,7 +1833,7 @@ Exit: /***************************************************************************** Desc: Reads decoded binary from the base64 ASCII source stream. *****************************************************************************/ -RCODE FLMAPI F_Base64DecoderIStream::read( +RCODE FTKAPI F_Base64DecoderIStream::read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead) @@ -1949,7 +1949,7 @@ Exit: /***************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_Base64EncoderIStream::openStream( +RCODE FTKAPI F_Base64EncoderIStream::openStream( IF_IStream * pIStream, FLMBOOL bLineBreaks) { @@ -1978,7 +1978,7 @@ Exit: /***************************************************************************** Desc: Reads ASCII base64 encoded binary from the source stream. *****************************************************************************/ -RCODE FLMAPI F_Base64EncoderIStream::read( +RCODE FTKAPI F_Base64EncoderIStream::read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead) @@ -2111,7 +2111,7 @@ Exit: /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_CompressingOStream::openStream( +RCODE FTKAPI F_CompressingOStream::openStream( IF_OStream * pOStream) { RCODE rc = NE_FLM_OK; @@ -2193,7 +2193,7 @@ LZWODictItem * F_CompressingOStream::findDictEntry( /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_CompressingOStream::write( +RCODE FTKAPI F_CompressingOStream::write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten) @@ -2363,7 +2363,7 @@ Exit: /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_CompressingOStream::closeStream( void) +RCODE FTKAPI F_CompressingOStream::closeStream( void) { RCODE rc = NE_FLM_OK; FLMBYTE ucOut[ 2]; @@ -2418,7 +2418,7 @@ RCODE FLMAPI F_CompressingOStream::closeStream( void) /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_UncompressingIStream::openStream( +RCODE FTKAPI F_UncompressingIStream::openStream( IF_IStream * pIStream) { RCODE rc = NE_FLM_OK; @@ -2546,7 +2546,7 @@ Exit: /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_UncompressingIStream::read( +RCODE FTKAPI F_UncompressingIStream::read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead) @@ -2664,7 +2664,7 @@ Exit: /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_UncompressingIStream::closeStream( void) +RCODE FTKAPI F_UncompressingIStream::closeStream( void) { if( m_pIStream) { @@ -2688,7 +2688,7 @@ RCODE FLMAPI F_UncompressingIStream::closeStream( void) /****************************************************************************** Desc: Read all data from input stream and write to the output stream. ******************************************************************************/ -RCODE FLMAPI FlmWriteToOStream( +RCODE FTKAPI FlmWriteToOStream( IF_IStream * pIStream, IF_OStream * pOStream) { @@ -2734,7 +2734,7 @@ Exit: /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI FlmReadFully( +RCODE FTKAPI FlmReadFully( IF_IStream * pIStream, F_DynaBuf * pDynaBuf) { @@ -2780,7 +2780,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmReadLine( +RCODE FTKAPI FlmReadLine( IF_IStream * pIStream, F_DynaBuf * pBuffer) { @@ -2833,7 +2833,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_printf( +RCODE FTKAPI f_printf( IF_OStream * pOStream, const char * pszFormatStr, ...) { @@ -2849,7 +2849,7 @@ RCODE FLMAPI f_printf( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_vprintf( +RCODE FTKAPI f_vprintf( IF_OStream * pOStream, const char * pszFormatStr, f_va_list * args) diff --git a/ftk/src/ftksupr.cpp b/ftk/src/ftksupr.cpp index 67a5e48..7ad8d09 100644 --- a/ftk/src/ftksupr.cpp +++ b/ftk/src/ftksupr.cpp @@ -82,7 +82,7 @@ F_SuperFileHdl::~F_SuperFileHdl() /**************************************************************************** Desc: Configures the super file object ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::setup( +RCODE FTKAPI F_SuperFileHdl::setup( IF_SuperFileClient * pSuperFileClient, IF_FileHdlCache * pFileHdlCache, FLMUINT uiFileOpenFlags, @@ -120,7 +120,7 @@ Exit: /**************************************************************************** Desc: Creates a file ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::createFile( +RCODE FTKAPI F_SuperFileHdl::createFile( FLMUINT uiFileNumber, IF_FileHdl ** ppFileHdl) { @@ -199,7 +199,7 @@ Exit: /**************************************************************************** Desc: Reads data from a file number into a buffer ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::readOffset( +RCODE FTKAPI F_SuperFileHdl::readOffset( FLMUINT uiFileNumber, FLMUINT uiOffset, FLMUINT uiBytesToRead, @@ -233,7 +233,7 @@ Exit: /**************************************************************************** Desc: Reads a database block into a buffer ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::readBlock( +RCODE FTKAPI F_SuperFileHdl::readBlock( FLMUINT uiBlkAddress, FLMUINT uiBytesToRead, void * pvBuffer, @@ -349,7 +349,7 @@ Exit: /**************************************************************************** Desc: Flush dirty files to disk. ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::flush( void) +RCODE FTKAPI F_SuperFileHdl::flush( void) { RCODE rc = NE_FLM_OK; @@ -381,7 +381,7 @@ Exit: /**************************************************************************** Desc: Truncates back to an end of file block address. ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::truncateFile( +RCODE FTKAPI F_SuperFileHdl::truncateFile( FLMUINT uiEOFBlkAddress) { RCODE rc = NE_FLM_OK; @@ -432,7 +432,7 @@ Exit: /**************************************************************************** Desc: Extends to an end of file block address. ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::allocateBlocks( +RCODE FTKAPI F_SuperFileHdl::allocateBlocks( FLMUINT uiStartAddress, FLMUINT uiEndAddress) { @@ -503,7 +503,7 @@ Exit: /**************************************************************************** Desc: Truncates back to an end of file block address. ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::truncateFile( +RCODE FTKAPI F_SuperFileHdl::truncateFile( FLMUINT uiFileNumber, FLMUINT uiOffset) { @@ -534,7 +534,7 @@ Exit: Desc: Truncate to zero length any files between the specified start and end files. ****************************************************************************/ -void FLMAPI F_SuperFileHdl::truncateFiles( +void FTKAPI F_SuperFileHdl::truncateFiles( FLMUINT uiStartFileNum, FLMUINT uiEndFileNum) { @@ -556,7 +556,7 @@ void FLMAPI F_SuperFileHdl::truncateFiles( /**************************************************************************** Desc: Returns the physical size of a file ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::getFileSize( +RCODE FTKAPI F_SuperFileHdl::getFileSize( FLMUINT uiFileNumber, FLMUINT64 * pui64FileSize) { @@ -588,7 +588,7 @@ Exit: /**************************************************************************** Desc: Returns the path of a file given its file number ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::getFilePath( +RCODE FTKAPI F_SuperFileHdl::getFilePath( FLMUINT uiFileNumber, char * pszIoPath) { @@ -598,7 +598,7 @@ RCODE FLMAPI F_SuperFileHdl::getFilePath( /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI F_SuperFileHdl::canDoAsync( void) +FLMBOOL FTKAPI F_SuperFileHdl::canDoAsync( void) { FLMBOOL bCanDoAsync = FALSE; @@ -623,7 +623,7 @@ FLMBOOL FLMAPI F_SuperFileHdl::canDoAsync( void) /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI F_SuperFileHdl::canDoDirectIO( void) +FLMBOOL FTKAPI F_SuperFileHdl::canDoDirectIO( void) { FLMBOOL bCanDoDirectIO = FALSE; @@ -648,7 +648,7 @@ FLMBOOL FLMAPI F_SuperFileHdl::canDoDirectIO( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::releaseFiles( void) +RCODE FTKAPI F_SuperFileHdl::releaseFiles( void) { RCODE rc = NE_FLM_OK; @@ -680,7 +680,7 @@ Exit: /**************************************************************************** Desc: Returns a file handle given the file's number ****************************************************************************/ -RCODE FLMAPI F_SuperFileHdl::getFileHdl( +RCODE FTKAPI F_SuperFileHdl::getFileHdl( FLMUINT uiFileNum, FLMBOOL bForUpdate, IF_FileHdl ** ppFileHdl) diff --git a/ftk/src/ftksys.h b/ftk/src/ftksys.h index 40f795a..0df8b9f 100644 --- a/ftk/src/ftksys.h +++ b/ftk/src/ftksys.h @@ -425,7 +425,7 @@ } } - FLMINT FLMAPI AddRef( void) + FLMINT FTKAPI AddRef( void) { return( f_atomicInc( &m_refCnt)); } @@ -433,7 +433,7 @@ FLMINT Release( FLMBOOL bMutexAlreadyLocked); - FLMINT FLMAPI Release( void) + FLMINT FTKAPI Release( void) { return( Release( FALSE)); } @@ -453,17 +453,17 @@ m_bCompleted = FALSE; } - FINLINE FLMBYTE * FLMAPI getBufferPtr( void) + FINLINE FLMBYTE * FTKAPI getBufferPtr( void) { return( m_pucBuffer); } - FINLINE FLMUINT FLMAPI getBufferSize( void) + FINLINE FLMUINT FTKAPI getBufferSize( void) { return( m_uiBufferSize); } - FINLINE void FLMAPI setCompletionCallback( + FINLINE void FTKAPI setCompletionCallback( F_BUFFER_COMPLETION_FUNC fnCompletion, void * pvData) { @@ -471,18 +471,18 @@ m_pvData = pvData; } - RCODE FLMAPI addCallbackData( + RCODE FTKAPI addCallbackData( void * pvData); - void * FLMAPI getCallbackData( + void * FTKAPI getCallbackData( FLMUINT uiSlot); - FINLINE FLMUINT FLMAPI getCallbackDataCount( void) + FINLINE FLMUINT FTKAPI getCallbackDataCount( void) { return( m_uiCallbackDataCount); } - FINLINE void FLMAPI cleanupBuffer( void) + FINLINE void FTKAPI cleanupBuffer( void) { if( m_fnCompletion) { @@ -502,7 +502,7 @@ m_ppCallbackData = m_callbackData; } - void FLMAPI setAsyncClient( + void FTKAPI setAsyncClient( IF_AsyncClient * pAsyncClient) { if( m_pAsyncClient) @@ -516,7 +516,7 @@ } } - void FLMAPI getAsyncClient( + void FTKAPI getAsyncClient( IF_AsyncClient ** ppAsyncClient) { if( (*ppAsyncClient = m_pAsyncClient) != NULL) @@ -525,19 +525,19 @@ } } - void FLMAPI setPending( void); + void FTKAPI setPending( void); - void FLMAPI clearPending( void); + void FTKAPI clearPending( void); - void FLMAPI notifyComplete( + void FTKAPI notifyComplete( RCODE completionRc); - FINLINE FLMBOOL FLMAPI isPending( void) + FINLINE FLMBOOL FTKAPI isPending( void) { return( m_bPending); } - FINLINE RCODE FLMAPI waitToComplete( void) + FINLINE RCODE FTKAPI waitToComplete( void) { RCODE rc = NE_FLM_OK; @@ -549,18 +549,18 @@ return( rc); } - FINLINE FLMBOOL FLMAPI isComplete( void) + FINLINE FLMBOOL FTKAPI isComplete( void) { return( m_bCompleted); } - FINLINE RCODE FLMAPI getCompletionCode( void) + FINLINE RCODE FTKAPI getCompletionCode( void) { f_assert( m_bCompleted); return( m_completionRc); } - FINLINE FLMUINT FLMAPI getElapsedTime( void) + FINLINE FLMUINT FTKAPI getElapsedTime( void) { f_assert( m_bCompleted); return( m_uiElapsedTime); @@ -617,24 +617,24 @@ ~F_FileAsyncClient(); - FLMINT FLMAPI AddRef( void) + FLMINT FTKAPI AddRef( void) { return( f_atomicInc( &m_refCnt)); } - FLMINT FLMAPI Release( void) + FLMINT FTKAPI Release( void) { return( Release( TRUE)); } - FLMINT FLMAPI Release( + FLMINT FTKAPI Release( FLMBOOL bOkToReuse); - RCODE FLMAPI waitToComplete( void); + RCODE FTKAPI waitToComplete( void); - RCODE FLMAPI getCompletionCode( void); + RCODE FTKAPI getCompletionCode( void); - FLMUINT FLMAPI getElapsedTime( void); + FLMUINT FTKAPI getElapsedTime( void); F_FileAsyncClient * m_pNext; @@ -643,7 +643,7 @@ return( m_uiBytesToDo); } - void FLMAPI notifyComplete( + void FTKAPI notifyComplete( RCODE completionRc, FLMUINT uiBytesDone); @@ -679,12 +679,12 @@ virtual ~F_FileHdl(); - FLMINT FLMAPI AddRef( void) + FLMINT FTKAPI AddRef( void) { return( f_atomicInc( &m_refCnt)); } - FLMINT FLMAPI Release( void) + FLMINT FTKAPI Release( void) { FLMINT iRefCnt = f_atomicDec( &m_refCnt); @@ -696,90 +696,90 @@ return( iRefCnt); } - RCODE FLMAPI flush( void); + RCODE FTKAPI flush( void); - RCODE FLMAPI read( + RCODE FTKAPI read( FLMUINT64 ui64Offset, FLMUINT uiLength, void * pvBuffer, FLMUINT * puiBytesRead = NULL); - RCODE FLMAPI read( + RCODE FTKAPI read( FLMUINT64 ui64ReadOffset, FLMUINT uiBytesToRead, IF_IOBuffer * pIOBuffer); - RCODE FLMAPI write( + RCODE FTKAPI write( FLMUINT64 ui64Offset, FLMUINT uiLength, const void * pvBuffer, FLMUINT * puiBytesWritten = NULL); - RCODE FLMAPI write( + RCODE FTKAPI write( FLMUINT64 ui64WriteOffset, FLMUINT uiBytesToWrite, IF_IOBuffer * pIOBuffer); - RCODE FLMAPI seek( + RCODE FTKAPI seek( FLMUINT64 ui64Offset, FLMINT iWhence, FLMUINT64 * pui64NewOffset = NULL); - RCODE FLMAPI size( + RCODE FTKAPI size( FLMUINT64 * pui64Size); - RCODE FLMAPI tell( + RCODE FTKAPI tell( FLMUINT64 * pui64Offset); - RCODE FLMAPI extendFile( + RCODE FTKAPI extendFile( FLMUINT64 ui64FileSize); - RCODE FLMAPI truncateFile( + RCODE FTKAPI truncateFile( FLMUINT64 ui64FileSize = 0); - RCODE FLMAPI closeFile( void); + RCODE FTKAPI closeFile( void); - FINLINE FLMBOOL FLMAPI canDoAsync( void) + FINLINE FLMBOOL FTKAPI canDoAsync( void) { return( m_bOpenedInAsyncMode); } - FINLINE FLMBOOL FLMAPI canDoDirectIO( void) + FINLINE FLMBOOL FTKAPI canDoDirectIO( void) { return( m_bDoDirectIO); } - FINLINE void FLMAPI setExtendSize( + FINLINE void FTKAPI setExtendSize( FLMUINT uiExtendSize) { f_assert( uiExtendSize < FLM_MAX_UINT); m_uiExtendSize = uiExtendSize; } - FINLINE void FLMAPI setMaxAutoExtendSize( + FINLINE void FTKAPI setMaxAutoExtendSize( FLMUINT uiMaxAutoExtendSize) { m_uiMaxAutoExtendSize = uiMaxAutoExtendSize; } - FINLINE FLMBOOL FLMAPI isReadOnly( void) + FINLINE FLMBOOL FTKAPI isReadOnly( void) { return( m_bOpenedReadOnly); } - FINLINE FLMBOOL FLMAPI isOpen( void) + FINLINE FLMBOOL FTKAPI isOpen( void) { return( m_bFileOpened); } - FINLINE FLMUINT FLMAPI getSectorSize( void) + FINLINE FLMUINT FTKAPI getSectorSize( void) { return( m_uiBytesPerSector); } - RCODE FLMAPI lock( void); + RCODE FTKAPI lock( void); - RCODE FLMAPI unlock( void); + RCODE FTKAPI unlock( void); static F_MUTEX m_hAsyncListMutex; static F_FileAsyncClient * m_pFirstAvailAsync; @@ -994,27 +994,27 @@ virtual ~F_DirHdl(); - RCODE FLMAPI next( void); + RCODE FTKAPI next( void); - const char * FLMAPI currentItemName( void); + const char * FTKAPI currentItemName( void); - void FLMAPI currentItemPath( + void FTKAPI currentItemPath( char * pszPath); - FLMUINT64 FLMAPI currentItemSize( void); + FLMUINT64 FTKAPI currentItemSize( void); - FLMBOOL FLMAPI currentItemIsDir( void); + FLMBOOL FTKAPI currentItemIsDir( void); private: - RCODE FLMAPI openDir( + RCODE FTKAPI openDir( const char * pszDirName, const char * pszPattern); - RCODE FLMAPI createDir( + RCODE FTKAPI createDir( const char * pszDirName); - RCODE FLMAPI removeDir( + RCODE FTKAPI removeDir( const char * pszDirPath); char m_szDirectoryPath[ F_PATH_MAX_SIZE]; @@ -1048,42 +1048,42 @@ virtual ~F_XML(); - RCODE FLMAPI setup( void); + RCODE FTKAPI setup( void); - FLMBOOL FLMAPI isPubidChar( + FLMBOOL FTKAPI isPubidChar( FLMUNICODE uChar); - FLMBOOL FLMAPI isQuoteChar( + FLMBOOL FTKAPI isQuoteChar( FLMUNICODE uChar); - FLMBOOL FLMAPI isWhitespace( + FLMBOOL FTKAPI isWhitespace( FLMUNICODE uChar); - FLMBOOL FLMAPI isExtender( + FLMBOOL FTKAPI isExtender( FLMUNICODE uChar); - FLMBOOL FLMAPI isCombiningChar( + FLMBOOL FTKAPI isCombiningChar( FLMUNICODE uChar); - FLMBOOL FLMAPI isNameChar( + FLMBOOL FTKAPI isNameChar( FLMUNICODE uChar); - FLMBOOL FLMAPI isNCNameChar( + FLMBOOL FTKAPI isNCNameChar( FLMUNICODE uChar); - FLMBOOL FLMAPI isIdeographic( + FLMBOOL FTKAPI isIdeographic( FLMUNICODE uChar); - FLMBOOL FLMAPI isBaseChar( + FLMBOOL FTKAPI isBaseChar( FLMUNICODE uChar); - FLMBOOL FLMAPI isDigit( + FLMBOOL FTKAPI isDigit( FLMUNICODE uChar); - FLMBOOL FLMAPI isLetter( + FLMBOOL FTKAPI isLetter( FLMUNICODE uChar); - FLMBOOL FLMAPI isNameValid( + FLMBOOL FTKAPI isNameValid( FLMUNICODE * puzName, FLMBYTE * pszName); @@ -1114,12 +1114,12 @@ RCODE setup( void); - FLMINT FLMAPI AddRef( void) + FLMINT FTKAPI AddRef( void) { return( f_atomicInc( &m_refCnt)); } - FLMINT FLMAPI Release( void) + FLMINT FTKAPI Release( void) { FLMINT iRefCnt = f_atomicDec( &m_refCnt); @@ -1131,66 +1131,66 @@ return( iRefCnt); } - RCODE FLMAPI createFile( + RCODE FTKAPI createFile( const char * pszFileName, FLMUINT uiIoFlags, IF_FileHdl ** ppFile); - RCODE FLMAPI createUniqueFile( + RCODE FTKAPI createUniqueFile( char * pszPath, const char * pszFileExtension, FLMUINT uiIoFlags, IF_FileHdl ** ppFile); - RCODE FLMAPI createLockFile( + RCODE FTKAPI createLockFile( const char * pszPath, IF_FileHdl ** ppLockFileHdl); - RCODE FLMAPI openFile( + RCODE FTKAPI openFile( const char * pszFileName, FLMUINT uiIoFlags, IF_FileHdl ** ppFile); - RCODE FLMAPI openDir( + RCODE FTKAPI openDir( const char * pszDirName, const char * pszPattern, IF_DirHdl ** ppDir); - RCODE FLMAPI createDir( + RCODE FTKAPI createDir( const char * pszDirName); - RCODE FLMAPI removeDir( + RCODE FTKAPI removeDir( const char * pszDirName, FLMBOOL bClear = FALSE); - RCODE FLMAPI doesFileExist( + RCODE FTKAPI doesFileExist( const char * pszFileName); - FLMBOOL FLMAPI isDir( + FLMBOOL FTKAPI isDir( const char * pszFileName); - RCODE FLMAPI getFileTimeStamp( + RCODE FTKAPI getFileTimeStamp( const char * pszFileName, FLMUINT * puiTimeStamp); - RCODE FLMAPI getFileSize( + RCODE FTKAPI getFileSize( const char * pszFileName, FLMUINT64 * pui64FileSize); - RCODE FLMAPI deleteFile( + RCODE FTKAPI deleteFile( const char * pszFileName); - RCODE FLMAPI deleteMultiFileStream( + RCODE FTKAPI deleteMultiFileStream( const char * pszDirectory, const char * pszBaseName); - RCODE FLMAPI copyFile( + RCODE FTKAPI copyFile( const char * pszSrcFileName, const char * pszDestFileName, FLMBOOL bOverwrite, FLMUINT64 * pui64BytesCopied); - RCODE FLMAPI copyPartialFile( + RCODE FTKAPI copyPartialFile( IF_FileHdl * pSrcFileHdl, FLMUINT64 ui64SrcOffset, FLMUINT64 ui64SrcSize, @@ -1198,62 +1198,62 @@ FLMUINT64 ui64DestOffset, FLMUINT64 * pui64BytesCopiedRV); - RCODE FLMAPI renameFile( + RCODE FTKAPI renameFile( const char * pszFileName, const char * pszNewFileName); - void FLMAPI pathParse( + void FTKAPI pathParse( const char * pszPath, char * pszServer, char * pszVolume, char * pszDirPath, char * pszFileName); - RCODE FLMAPI pathReduce( + RCODE FTKAPI pathReduce( const char * pszSourcePath, char * pszDestPath, char * pszString); - RCODE FLMAPI pathAppend( + RCODE FTKAPI pathAppend( char * pszPath, const char * pszPathComponent); - RCODE FLMAPI pathToStorageString( + RCODE FTKAPI pathToStorageString( const char * pszPath, char * pszString); - void FLMAPI pathCreateUniqueName( + void FTKAPI pathCreateUniqueName( FLMUINT * puiTime, char * pszFileName, const char * pszFileExt, FLMBYTE * pHighChars, FLMBOOL bModext); - FLMBOOL FLMAPI doesFileMatch( + FLMBOOL FTKAPI doesFileMatch( const char * pszFileName, const char * pszTemplate); - RCODE FLMAPI getSectorSize( + RCODE FTKAPI getSectorSize( const char * pszFileName, FLMUINT * puiSectorSize); - RCODE FLMAPI setReadOnly( + RCODE FTKAPI setReadOnly( const char * pszFileName, FLMBOOL bReadOnly); - FLMBOOL FLMAPI canDoAsync( void); + FLMBOOL FTKAPI canDoAsync( void); - FLMUINT FLMAPI getPendingAsyncCount( void); + FLMUINT FTKAPI getPendingAsyncCount( void); - RCODE FLMAPI getFileId( + RCODE FTKAPI getFileId( const char * pszFileName, FLMUINT64 * pui64FileId); - RCODE FLMAPI allocIOBuffer( + RCODE FTKAPI allocIOBuffer( FLMUINT uiMinSize, IF_IOBuffer ** ppIOBuffer); - RCODE FLMAPI allocFileHandleCache( + RCODE FTKAPI allocFileHandleCache( FLMUINT uiMaxCachedFiles, FLMUINT uiIdleTimeoutSecs, IF_FileHdlCache ** ppFileHdlCache); diff --git a/ftk/src/ftktext.cpp b/ftk/src/ftktext.cpp index 0a74c2c..4aaa9aa 100644 --- a/ftk/src/ftktext.cpp +++ b/ftk/src/ftktext.cpp @@ -2199,7 +2199,7 @@ const unsigned char UnicodeProperties[ 32768] = /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI f_isWhitespace( +FLMBOOL FTKAPI f_isWhitespace( FLMUNICODE uzChar) { return( f_getXmlObjPtr()->isWhitespace( uzChar)); @@ -2210,7 +2210,7 @@ Desc: Unsigned word to NATIVE value - null terminate the native string Return: char pointer to the NULL byte in the native string Notes: Radix not defined because it is not needed ****************************************************************************/ -char * FLMAPI f_uwtoa( +char * FTKAPI f_uwtoa( FLMUINT16 value, char * ptr) { @@ -2231,7 +2231,7 @@ Return: UDWORD value of what is being pointed to Notes: This algorithm is NOT standard, assumes UNSIGNED char arithmetic so (20 - 30) should be 245 and NOT -10. ****************************************************************************/ -FLMUINT FLMAPI f_atoud( +FLMUINT FTKAPI f_atoud( const char * pszBuf, FLMBOOL bAllowUnprefixedHex) { @@ -2300,7 +2300,7 @@ Return: FLMUINT64 value of what is being pointed to Notes: This algorithm is NOT standard, assumes UNSIGNED char arithmetic so (20 - 30) should be 245 and NOT -10. ****************************************************************************/ -FLMUINT64 FLMAPI f_atou64( +FLMUINT64 FTKAPI f_atou64( const char * pszBuf) { FLMUINT64 ui64Value; @@ -2361,7 +2361,7 @@ Desc: Unsigned double (4 byte) number to native value & null terminate Return: char pointer to the NULL byte in the native string Notes: Radix not defined. ****************************************************************************/ -char * FLMAPI f_udtoa( +char * FTKAPI f_udtoa( FLMUINT value, char * ptr) { @@ -2380,7 +2380,7 @@ Desc: Word to native value - null terminate the native string Return: char pointer to the NULL byte in the native string Notes: Radix not defined because it is not needed ****************************************************************************/ -char * FLMAPI f_wtoa( +char * FTKAPI f_wtoa( FLMINT16 value, char * ptr) { @@ -2401,7 +2401,7 @@ char * FLMAPI f_wtoa( Desc: Double (4 byte) number to native value - null terminate the string Return: char pointer to the NULL byte in the native string ****************************************************************************/ -char * FLMAPI f_dtoa( +char * FTKAPI f_dtoa( FLMINT value, char * ptr) { @@ -2421,7 +2421,7 @@ char * FLMAPI f_dtoa( /***************************************************************************** Desc: Convert unsigned 64 bit value to ASCII. *****************************************************************************/ -char * FLMAPI f_ui64toa( +char * FTKAPI f_ui64toa( FLMUINT64 ui64Value, char * pszAscii) { @@ -2454,7 +2454,7 @@ char * FLMAPI f_ui64toa( /***************************************************************************** Desc: Convert signed 64 bit value to ASCII. *****************************************************************************/ -char * FLMAPI f_i64toa( +char * FTKAPI f_i64toa( FLMINT64 i64Value, char * pszAscii) { @@ -2469,7 +2469,7 @@ char * FLMAPI f_i64toa( /**************************************************************************** Desc: Ascii to integer ****************************************************************************/ -FLMINT FLMAPI f_atoi( +FLMINT FTKAPI f_atoi( const char * pszStr) { return( f_atod( pszStr)); @@ -2478,7 +2478,7 @@ FLMINT FLMAPI f_atoi( /**************************************************************************** Desc: native to long ****************************************************************************/ -FLMINT FLMAPI f_atol( +FLMINT FTKAPI f_atol( const char * pszStr) { return( f_atod( pszStr)); @@ -2491,7 +2491,7 @@ Return: DWORD value of what is being pointed to Notes: This algorithm is NOT standard! Assumes UNSIGNED char arithmetic so (20 - 30) should be 245 and NOT -10. ****************************************************************************/ -FLMINT FLMAPI f_atod( +FLMINT FTKAPI f_atod( const char * pszBuf) { FLMINT iValue; @@ -2514,7 +2514,7 @@ FLMINT FLMAPI f_atod( /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI f_atobool( +FLMBOOL FTKAPI f_atobool( const char * pszStr, FLMBOOL * pbValidFormat) { @@ -2604,7 +2604,7 @@ FINLINE FLMUINT maxDecimalSize( /**************************************************************************** Desc: Returns the length of a unicode string ****************************************************************************/ -FLMUINT FLMAPI f_unilen( +FLMUINT FTKAPI f_unilen( const FLMUNICODE * puzStr) { FLMUINT uiLen = 0; @@ -2628,7 +2628,7 @@ Exit: /**************************************************************************** Desc: Copies a unicode string ****************************************************************************/ -FLMUNICODE * FLMAPI f_unicpy( +FLMUNICODE * FTKAPI f_unicpy( FLMUNICODE * puzDestStr, const FLMUNICODE * puzSrcStr) { @@ -2647,7 +2647,7 @@ FLMUNICODE * FLMAPI f_unicpy( /**************************************************************************** Desc: A rather trivial unicode monocase function. ****************************************************************************/ -FLMUNICODE FLMAPI f_uniToLower( +FLMUNICODE FTKAPI f_uniToLower( FLMUNICODE uChar) { static const FLMUNICODE basicAlpha[ 0x600] = @@ -4732,7 +4732,7 @@ FLMUNICODE FLMAPI f_uniToLower( /**************************************************************************** Desc: Compares two Unicode strings ****************************************************************************/ -FLMINT FLMAPI f_unicmp( +FLMINT FTKAPI f_unicmp( const FLMUNICODE * puzStr1, const FLMUNICODE * puzStr2) { @@ -4748,7 +4748,7 @@ FLMINT FLMAPI f_unicmp( /**************************************************************************** Desc: Performs a case-insensitive comparision of two Unicode strings ****************************************************************************/ -FLMINT FLMAPI f_uniicmp( +FLMINT FTKAPI f_uniicmp( const FLMUNICODE * puzStr1, const FLMUNICODE * puzStr2) { @@ -4764,7 +4764,7 @@ FLMINT FLMAPI f_uniicmp( /**************************************************************************** Desc: Compares two strings, one Unicode and one native ****************************************************************************/ -FLMINT FLMAPI f_uninativecmp( +FLMINT FTKAPI f_uninativecmp( const FLMUNICODE * puzStr1, const char * pszStr2) { @@ -4780,7 +4780,7 @@ FLMINT FLMAPI f_uninativecmp( /**************************************************************************** Desc: Compares two strings, one Unicode and one native ****************************************************************************/ -FLMINT FLMAPI f_uninativencmp( +FLMINT FTKAPI f_uninativencmp( const FLMUNICODE * puzStr1, const char * pszStr2, FLMUINT uiCount) @@ -4804,7 +4804,7 @@ FLMINT FLMAPI f_uninativencmp( /*************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI f_uniIsUpper( +FLMBOOL FTKAPI f_uniIsUpper( FLMUNICODE uzChar) { FLMBOOL bRV; @@ -4828,7 +4828,7 @@ FLMBOOL FLMAPI f_uniIsUpper( /*************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI f_uniIsLower( +FLMBOOL FTKAPI f_uniIsLower( FLMUNICODE uzChar) { FLMBOOL bRV; @@ -4852,7 +4852,7 @@ FLMBOOL FLMAPI f_uniIsLower( /*************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI f_uniIsAlpha( +FLMBOOL FTKAPI f_uniIsAlpha( FLMUNICODE uzChar) { FLMBOOL bRV; @@ -4876,7 +4876,7 @@ FLMBOOL FLMAPI f_uniIsAlpha( /*************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI f_uniIsDecimalDigit( +FLMBOOL FTKAPI f_uniIsDecimalDigit( FLMUNICODE uzChar) { FLMBOOL bRV; @@ -4900,7 +4900,7 @@ FLMBOOL FLMAPI f_uniIsDecimalDigit( /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_nextUCS2Char( +RCODE FTKAPI f_nextUCS2Char( const FLMBYTE ** ppszUTF8, const FLMBYTE * pszEndOfUTF8String, FLMUNICODE * puzChar) @@ -4911,7 +4911,7 @@ RCODE FLMAPI f_nextUCS2Char( /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_numUCS2Chars( +RCODE FTKAPI f_numUCS2Chars( const FLMBYTE * pszUTF8, FLMUINT * puiNumChars) { @@ -4943,7 +4943,7 @@ Exit: /**************************************************************************** Desc: Reads the next character from the storage buffer ****************************************************************************/ -RCODE FLMAPI f_getCharFromUTF8Buf( +RCODE FTKAPI f_getCharFromUTF8Buf( const FLMBYTE ** ppucBuf, const FLMBYTE * pucEnd, FLMUNICODE * puChar) @@ -4999,7 +4999,7 @@ RCODE FLMAPI f_getCharFromUTF8Buf( /**************************************************************************** Desc: Convert a Unicode character to UTF-8 *****************************************************************************/ -RCODE FLMAPI f_uni2UTF8( +RCODE FTKAPI f_uni2UTF8( FLMUNICODE uChar, FLMBYTE * pucBuf, FLMUINT * puiBufSize) @@ -5055,7 +5055,7 @@ Desc: Reads the next UTF-8 character from a UTF-8 buffer Notes: This routine assumes that the destination buffer can hold at least three bytes ****************************************************************************/ -RCODE FLMAPI f_getUTF8CharFromUTF8Buf( +RCODE FTKAPI f_getUTF8CharFromUTF8Buf( FLMBYTE ** ppucBuf, FLMBYTE * pucEnd, FLMBYTE * pucDestBuf, @@ -5111,7 +5111,7 @@ RCODE FLMAPI f_getUTF8CharFromUTF8Buf( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_getUTF8Length( +RCODE FTKAPI f_getUTF8Length( const FLMBYTE * pucBuf, FLMUINT uiBufLen, FLMUINT * puiBytes, @@ -5178,7 +5178,7 @@ Exit: /**************************************************************************** Desc: Reads the next UTF-8 character from the stream ****************************************************************************/ -RCODE FLMAPI f_readUTF8CharAsUnicode( +RCODE FTKAPI f_readUTF8CharAsUnicode( IF_IStream * pIStream, FLMUNICODE * puChar) { @@ -5252,7 +5252,7 @@ Exit: Desc: Format text removing leading and trailing spaces. Treat underscores as spaces. As options, remove all spaces and dashes. ****************************************************************************/ -RCODE FLMAPI f_formatUTF8Text( +RCODE FTKAPI f_formatUTF8Text( IF_PosIStream * pIStream, FLMBOOL bAllowEscapes, FLMUINT uiCompareRules, @@ -5554,7 +5554,7 @@ Notes: Lawrence Philips' Metaphone Algorithm is an algorithm which returns than returning the character representation of the encoded word, this routine returns a 16-bit numeric representation. ****************************************************************************/ -RCODE FLMAPI f_getNextMetaphone( +RCODE FTKAPI f_getNextMetaphone( IF_IStream * pIStream, FLMUINT * puiMetaphone, FLMUINT * puiAltMetaphone) @@ -7323,7 +7323,7 @@ Exit: Desc: Notes: pucBuf must be able to contain at least 3 bytes ******************************************************************************/ -RCODE FLMAPI f_readUTF8CharAsUTF8( +RCODE FTKAPI f_readUTF8CharAsUTF8( IF_IStream * pIStream, FLMBYTE * pucBuf, FLMUINT * puiLen) @@ -7415,7 +7415,7 @@ Exit: /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_compareUnicodeStrings( +RCODE FTKAPI f_compareUnicodeStrings( const FLMUNICODE * puzLString, FLMUINT uiLStrBytes, FLMBOOL bLeftWild, @@ -7471,7 +7471,7 @@ Exit: /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_compareUTF8Strings( +RCODE FTKAPI f_compareUTF8Strings( const FLMBYTE * pucLString, FLMUINT uiLStrBytes, FLMBOOL bLeftWild, @@ -7528,7 +7528,7 @@ Exit: /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_compareUTF8Streams( +RCODE FTKAPI f_compareUTF8Streams( IF_PosIStream * pLStream, FLMBOOL bLeftWild, IF_PosIStream * pRStream, @@ -7568,7 +7568,7 @@ Exit: /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_compareUnicodeStreams( +RCODE FTKAPI f_compareUnicodeStreams( IF_PosIStream * pLStream, FLMBOOL bLeftWild, IF_PosIStream * pRStream, @@ -7608,7 +7608,7 @@ Exit: /*************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_utf8IsSubStr( +RCODE FTKAPI f_utf8IsSubStr( const FLMBYTE * pszString, const FLMBYTE * pszSubString, FLMUINT uiCompareRules, @@ -7652,7 +7652,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_strdup( +RCODE FTKAPI f_strdup( const char * pszSrc, char ** ppszDup) { diff --git a/ftk/src/ftkthrd.cpp b/ftk/src/ftkthrd.cpp index 0f34b5e..6878b65 100644 --- a/ftk/src/ftkthrd.cpp +++ b/ftk/src/ftkthrd.cpp @@ -61,14 +61,14 @@ public: virtual ~F_ThreadMgr(); - RCODE FLMAPI setupThreadMgr( void); + RCODE FTKAPI setupThreadMgr( void); - FLMINT FLMAPI AddRef( void) + FLMINT FTKAPI AddRef( void) { return( f_atomicInc( &m_refCnt)); } - FLMINT FLMAPI Release( void) + FLMINT FTKAPI Release( void) { FLMINT iRefCnt = f_atomicDec( &m_refCnt); @@ -80,7 +80,7 @@ public: return( iRefCnt); } - RCODE FLMAPI createThread( + RCODE FTKAPI createThread( IF_Thread ** ppThread, F_THREAD_FUNC fnThread, const char * pszThreadName, @@ -90,37 +90,37 @@ public: void * pvParm2, FLMUINT uiStackSize); - void FLMAPI shutdownThreadGroup( + void FTKAPI shutdownThreadGroup( FLMUINT uiThreadGroup); - void FLMAPI setThreadShutdownFlag( + void FTKAPI setThreadShutdownFlag( FLMUINT uiThreadId); - RCODE FLMAPI findThread( + RCODE FTKAPI findThread( IF_Thread ** ppThread, FLMUINT uiThreadGroup, FLMUINT uiAppId = 0, FLMBOOL bOkToFindMe = TRUE); - RCODE FLMAPI getNextGroupThread( + RCODE FTKAPI getNextGroupThread( IF_Thread ** ppThread, FLMUINT uiThreadGroup, FLMUINT * puiThreadId); - RCODE FLMAPI getThreadInfo( + RCODE FTKAPI getThreadInfo( F_Pool * pPool, F_THREAD_INFO ** ppThreadInfo, FLMUINT * puiNumThreads); - RCODE FLMAPI getThreadName( + RCODE FTKAPI getThreadName( FLMUINT uiThreadId, char * pszThreadName, FLMUINT * puiLength); - FLMUINT FLMAPI getThreadGroupCount( + FLMUINT FTKAPI getThreadGroupCount( FLMUINT uiThreadGroup); - FLMUINT FLMAPI allocGroupId( void); + FLMUINT FTKAPI allocGroupId( void); inline void lockMutex( void) { @@ -175,11 +175,11 @@ public: cleanupThread(); } - FLMINT FLMAPI AddRef( void); + FLMINT FTKAPI AddRef( void); - FLMINT FLMAPI Release( void); + FLMINT FTKAPI Release( void); - RCODE FLMAPI startThread( + RCODE FTKAPI startThread( F_THREAD_FUNC fnThread, const char * pszThreadName, FLMUINT uiThreadGroup, @@ -188,65 +188,65 @@ public: void * pvParm2, FLMUINT uiStackSize); - void FLMAPI stopThread( void); + void FTKAPI stopThread( void); - FINLINE FLMUINT FLMAPI getThreadId( void) + FINLINE FLMUINT FTKAPI getThreadId( void) { return( m_uiThreadId); } - FINLINE FLMBOOL FLMAPI getShutdownFlag( void) + FINLINE FLMBOOL FTKAPI getShutdownFlag( void) { return( m_bShutdown); } - FINLINE RCODE FLMAPI getExitCode( void) + FINLINE RCODE FTKAPI getExitCode( void) { return( m_exitRc); } - FINLINE void * FLMAPI getParm1( void) + FINLINE void * FTKAPI getParm1( void) { return( m_pvParm1); } - FINLINE void FLMAPI setParm1( + FINLINE void FTKAPI setParm1( void * pvParm) { m_pvParm1 = pvParm; } - FINLINE void * FLMAPI getParm2( void) + FINLINE void * FTKAPI getParm2( void) { return( m_pvParm2); } - FINLINE void FLMAPI setParm2( + FINLINE void FTKAPI setParm2( void * pvParm) { m_pvParm2 = pvParm; } - FINLINE void FLMAPI setShutdownFlag( void) + FINLINE void FTKAPI setShutdownFlag( void) { m_bShutdown = TRUE; } - FINLINE FLMBOOL FLMAPI isThreadRunning( void) + FINLINE FLMBOOL FTKAPI isThreadRunning( void) { return( m_bRunning); } - void FLMAPI setThreadStatusStr( + void FTKAPI setThreadStatusStr( const char * pszStatus); - void FLMAPI setThreadStatus( + void FTKAPI setThreadStatus( const char * pszBuffer, ...); - void FLMAPI setThreadStatus( + void FTKAPI setThreadStatus( eThreadStatus genericStatus); - FINLINE void FLMAPI setThreadAppId( + FINLINE void FTKAPI setThreadAppId( FLMUINT uiAppId) { f_mutexLock( m_hMutex); @@ -254,22 +254,22 @@ public: f_mutexUnlock( m_hMutex); } - FINLINE FLMUINT FLMAPI getThreadAppId( void) + FINLINE FLMUINT FTKAPI getThreadAppId( void) { return( m_uiAppId); } - FINLINE FLMUINT FLMAPI getThreadGroup( void) + FINLINE FLMUINT FTKAPI getThreadGroup( void) { return( m_uiThreadGroup); } - void FLMAPI cleanupThread( void); + void FTKAPI cleanupThread( void); - void FLMAPI sleep( + void FTKAPI sleep( FLMUINT uiMilliseconds); - void FLMAPI waitToComplete( void); + void FTKAPI waitToComplete( void); F_MUTEX m_hMutex; F_Thread * m_pPrev; @@ -311,12 +311,12 @@ public: m_pool.poolFree(); } - FLMUINT FLMAPI getNumThreads( void) + FLMUINT FTKAPI getNumThreads( void) { return( m_uiNumThreads); } - FINLINE void FLMAPI getThreadInfo( + FINLINE void FTKAPI getThreadInfo( FLMUINT uiThreadNum, FLMUINT * puiThreadId, FLMUINT * puiThreadGroup, @@ -387,7 +387,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmGetThreadMgr( +RCODE FTKAPI FlmGetThreadMgr( IF_ThreadMgr ** ppThreadMgr) { *ppThreadMgr = f_getThreadMgrPtr(); @@ -398,7 +398,7 @@ RCODE FLMAPI FlmGetThreadMgr( /**************************************************************************** Desc: Add a Reference to this object. ****************************************************************************/ -FLMINT FLMAPI F_Thread::AddRef( void) +FLMINT FTKAPI F_Thread::AddRef( void) { return( f_atomicInc( &m_refCnt)); } @@ -406,7 +406,7 @@ FLMINT FLMAPI F_Thread::AddRef( void) /**************************************************************************** Desc: Removes a reference to this object. ****************************************************************************/ -FLMINT FLMAPI F_Thread::Release( void) +FLMINT FTKAPI F_Thread::Release( void) { FLMINT iRefCnt = f_atomicDec( &m_refCnt); @@ -421,7 +421,7 @@ FLMINT FLMAPI F_Thread::Release( void) /**************************************************************************** Desc: Performs various setup work and starts a new thread ****************************************************************************/ -RCODE FLMAPI F_Thread::startThread( +RCODE FTKAPI F_Thread::startThread( F_THREAD_FUNC fnThread, const char * pszThreadName, FLMUINT uiThreadGroup, @@ -620,7 +620,7 @@ Exit: /**************************************************************************** Desc: Stop a running thread ****************************************************************************/ -void FLMAPI F_Thread::stopThread( void) +void FTKAPI F_Thread::stopThread( void) { // Set the shutdown flag and wait for the thread's // status to be something other than "running" @@ -639,7 +639,7 @@ void FLMAPI F_Thread::stopThread( void) /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_Thread::waitToComplete( void) +void FTKAPI F_Thread::waitToComplete( void) { while( m_bRunning) { @@ -740,7 +740,7 @@ void * threadStub( Desc: Frees any resources allocated to the thread and resets member variables to their initial state ****************************************************************************/ -void FLMAPI F_Thread::cleanupThread( void) +void FTKAPI F_Thread::cleanupThread( void) { f_assert( !m_pPrev && !m_pNext); @@ -776,7 +776,7 @@ void FLMAPI F_Thread::cleanupThread( void) /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_Thread::sleep( +void FTKAPI F_Thread::sleep( FLMUINT uiMilliseconds) { FLMUINT uiTimeToSleep; @@ -798,7 +798,7 @@ void FLMAPI F_Thread::sleep( /**************************************************************************** Desc: Set the thread's status ****************************************************************************/ -void FLMAPI F_Thread::setThreadStatusStr( +void FTKAPI F_Thread::setThreadStatusStr( const char * pszStatus) { FLMUINT uiStatusLen = f_strlen( pszStatus) + 1; @@ -832,7 +832,7 @@ Exit: /**************************************************************************** Desc: Set the thread's status ****************************************************************************/ -void FLMAPI F_Thread::setThreadStatus( +void FTKAPI F_Thread::setThreadStatus( const char * pszFormat, ...) { char pucBuffer[ 128]; @@ -848,7 +848,7 @@ void FLMAPI F_Thread::setThreadStatus( /**************************************************************************** Desc: Set the thread's status to a generic string ****************************************************************************/ -void FLMAPI F_Thread::setThreadStatus( +void FTKAPI F_Thread::setThreadStatus( eThreadStatus genericStatus) { const char * pszStatus = NULL; @@ -914,7 +914,7 @@ F_ThreadMgr::~F_ThreadMgr() /**************************************************************************** Desc: Allocates resources needed by the thread manager ****************************************************************************/ -RCODE FLMAPI F_ThreadMgr::setupThreadMgr( void) +RCODE FTKAPI F_ThreadMgr::setupThreadMgr( void) { RCODE rc = NE_FLM_OK; @@ -994,7 +994,7 @@ Exit: Desc: Signals all threads in a thread group to shut down and waits for them to terminate. ****************************************************************************/ -void FLMAPI F_ThreadMgr::shutdownThreadGroup( +void FTKAPI F_ThreadMgr::shutdownThreadGroup( FLMUINT uiThreadGroup) { F_Thread * pThread; @@ -1037,7 +1037,7 @@ void FLMAPI F_ThreadMgr::shutdownThreadGroup( /**************************************************************************** Desc: Signals a thread to shut down. ****************************************************************************/ -void FLMAPI F_ThreadMgr::setThreadShutdownFlag( +void FTKAPI F_ThreadMgr::setThreadShutdownFlag( FLMUINT uiThreadId) { F_Thread * pThread; @@ -1063,7 +1063,7 @@ void FLMAPI F_ThreadMgr::setThreadShutdownFlag( Desc: Allocates an array of F_THREAD_INFO structures and populates them with information about the threads being managed by this object. ****************************************************************************/ -RCODE FLMAPI F_ThreadMgr::getThreadInfo( +RCODE FTKAPI F_ThreadMgr::getThreadInfo( F_Pool * pPool, F_THREAD_INFO ** ppThreadInfo, FLMUINT * puiNumThreads) @@ -1182,7 +1182,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_ThreadMgr::getThreadName( +RCODE FTKAPI F_ThreadMgr::getThreadName( FLMUINT uiThreadId, char * pszThreadName, FLMUINT * puiLength) @@ -1274,7 +1274,7 @@ Exit: /**************************************************************************** Desc: Finds a thread based on user-specified identifiers ****************************************************************************/ -RCODE FLMAPI F_ThreadMgr::findThread( +RCODE FTKAPI F_ThreadMgr::findThread( IF_Thread ** ppThread, FLMUINT uiThreadGroup, FLMUINT uiAppId, @@ -1334,7 +1334,7 @@ Exit: /**************************************************************************** Desc: Finds a thread based on user-specified identifiers ****************************************************************************/ -RCODE FLMAPI F_ThreadMgr::getNextGroupThread( +RCODE FTKAPI F_ThreadMgr::getNextGroupThread( IF_Thread ** ppThread, FLMUINT uiThreadGroup, FLMUINT * puiThreadId) @@ -1403,7 +1403,7 @@ Exit: /**************************************************************************** Desc: Returns a count of the number of threads in a specified group ****************************************************************************/ -FLMUINT FLMAPI F_ThreadMgr::getThreadGroupCount( +FLMUINT FTKAPI F_ThreadMgr::getThreadGroupCount( FLMUINT uiThreadGroup) { F_Thread * pThread; @@ -1429,7 +1429,7 @@ FLMUINT FLMAPI F_ThreadMgr::getThreadGroupCount( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_ThreadMgr::allocGroupId( void) +FLMUINT FTKAPI F_ThreadMgr::allocGroupId( void) { return( f_atomicInc( &m_groupCounter)); } @@ -1437,7 +1437,7 @@ FLMUINT FLMAPI F_ThreadMgr::allocGroupId( void) /**************************************************************************** Desc: Allocate a thread object and start the thread ****************************************************************************/ -RCODE FLMAPI F_ThreadMgr::createThread( +RCODE FTKAPI F_ThreadMgr::createThread( IF_Thread ** ppThread, F_THREAD_FUNC fnThread, const char * pszThreadName, @@ -1493,7 +1493,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI f_threadCreate( +RCODE FTKAPI f_threadCreate( IF_Thread ** ppThread, F_THREAD_FUNC fnThread, const char * pszThreadName, @@ -1510,7 +1510,7 @@ RCODE FLMAPI f_threadCreate( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_threadDestroy( +void FTKAPI f_threadDestroy( IF_Thread ** ppThread) { if( *ppThread != NULL) @@ -1540,7 +1540,7 @@ FLMUINT f_getpid( void) /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI f_threadId( void) +FLMUINT FTKAPI f_threadId( void) { #ifdef FLM_WIN return( (FLMUINT)_threadid); @@ -1556,7 +1556,7 @@ FLMUINT FLMAPI f_threadId( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI FlmGetThreadInfo( +RCODE FTKAPI FlmGetThreadInfo( IF_ThreadInfo ** ppThreadInfo) { RCODE rc = NE_FLM_OK; diff --git a/ftk/src/ftktime.cpp b/ftk/src/ftktime.cpp index 211469a..af78ca3 100644 --- a/ftk/src/ftktime.cpp +++ b/ftk/src/ftktime.cpp @@ -83,7 +83,7 @@ static FLMUINT f_timeLeapYearsSince1970( /**************************************************************************** Desc: Gets the number of seconds since 1980 or 1970. ****************************************************************************/ -void FLMAPI f_timeGetSeconds( +void FTKAPI f_timeGetSeconds( FLMUINT * puiSeconds) { #if defined( FLM_WIN) @@ -101,7 +101,7 @@ void FLMAPI f_timeGetSeconds( Desc: Gets the time stamp from the system clock. Notes: ****************************************************************************/ -void FLMAPI f_timeGetTimeStamp( +void FTKAPI f_timeGetTimeStamp( F_TMSTAMP * pTimeStamp) { #if defined( FLM_WIN) @@ -147,7 +147,7 @@ void FLMAPI f_timeGetTimeStamp( /**************************************************************************** Desc: Returns the local time bias in seconds ****************************************************************************/ -FLMINT FLMAPI f_timeGetLocalOffset( void) +FLMINT FTKAPI f_timeGetLocalOffset( void) { FLMINT iOffset = 0; @@ -234,7 +234,7 @@ static FLMUINT f_timeLeapYearsSince1970( Desc: Convert from seconds to the F_TMSTAMP structure. Notes: ****************************************************************************/ -void FLMAPI f_timeSecondsToDate( +void FTKAPI f_timeSecondsToDate( FLMUINT uiSeconds, F_TMSTAMP * date) { @@ -286,7 +286,7 @@ void FLMAPI f_timeSecondsToDate( /**************************************************************************** Desc: Convert a time stamp to the number of seconds. ****************************************************************************/ -void FLMAPI f_timeDateToSeconds( +void FTKAPI f_timeDateToSeconds( F_TMSTAMP * pTimeStamp, FLMUINT * puiSeconds) { @@ -332,7 +332,7 @@ Ret: -1 if date1 is less than date2 1 if date1 is greater than date2 Notes: ****************************************************************************/ -FLMINT FLMAPI f_timeCompareTimeStamps( +FLMINT FTKAPI f_timeCompareTimeStamps( F_TMSTAMP * pTimeStamp1, F_TMSTAMP * pTimeStamp2, FLMUINT flag) @@ -392,7 +392,7 @@ unsigned f_timeGetMilliTime() /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI FLM_GET_TIMER( void) +FLMUINT FTKAPI FLM_GET_TIMER( void) { #if defined( FLM_WIN) return( (FLMUINT)GetTickCount()); @@ -406,7 +406,7 @@ FLMUINT FLMAPI FLM_GET_TIMER( void) /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI FLM_ELAPSED_TIME( +FLMUINT FTKAPI FLM_ELAPSED_TIME( FLMUINT uiLaterTime, FLMUINT uiEarlierTime) { @@ -422,7 +422,7 @@ FLMUINT FLMAPI FLM_ELAPSED_TIME( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI FLM_SECS_TO_TIMER_UNITS( +FLMUINT FTKAPI FLM_SECS_TO_TIMER_UNITS( FLMUINT uiSeconds) { #ifndef FLM_RING_ZERO_NLM @@ -438,7 +438,7 @@ FLMUINT FLMAPI FLM_SECS_TO_TIMER_UNITS( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI FLM_TIMER_UNITS_TO_SECS( +FLMUINT FTKAPI FLM_TIMER_UNITS_TO_SECS( FLMUINT uiTU) { #ifndef FLM_RING_ZERO_NLM @@ -455,7 +455,7 @@ FLMUINT FLMAPI FLM_TIMER_UNITS_TO_SECS( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI FLM_TIMER_UNITS_TO_MILLI( +FLMUINT FTKAPI FLM_TIMER_UNITS_TO_MILLI( FLMUINT uiTU) { #ifndef FLM_RING_ZERO_NLM @@ -472,7 +472,7 @@ FLMUINT FLMAPI FLM_TIMER_UNITS_TO_MILLI( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI FLM_MILLI_TO_TIMER_UNITS( +FLMUINT FTKAPI FLM_MILLI_TO_TIMER_UNITS( FLMUINT uiMilliSeconds) { #ifndef FLM_RING_ZERO_NLM @@ -598,7 +598,7 @@ Adj_6: /**************************************************************************** Desc: Calculate the elapsed time, including milliseconds. ****************************************************************************/ -void FLMAPI f_addElapsedTime( +void FTKAPI f_addElapsedTime( F_TMSTAMP * pStartTime, FLMUINT64 * pui64ElapMilli) { diff --git a/ftk/src/ftkwin.cpp b/ftk/src/ftkwin.cpp index bd1968f..915721c 100644 --- a/ftk/src/ftkwin.cpp +++ b/ftk/src/ftkwin.cpp @@ -326,7 +326,7 @@ Exit: /**************************************************************************** Desc: Close a file ****************************************************************************/ -RCODE FLMAPI F_FileHdl::closeFile( void) +RCODE FTKAPI F_FileHdl::closeFile( void) { if( m_bFlushRequired) { @@ -366,7 +366,7 @@ RCODE FLMAPI F_FileHdl::closeFile( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_FileHdl::flush( void) +RCODE FTKAPI F_FileHdl::flush( void) { RCODE rc = NE_FLM_OK; @@ -756,7 +756,7 @@ Exit: /**************************************************************************** Desc: Return the size of the file ****************************************************************************/ -RCODE FLMAPI F_FileHdl::size( +RCODE FTKAPI F_FileHdl::size( FLMUINT64 * pui64Size) { RCODE rc = NE_FLM_OK; @@ -778,7 +778,7 @@ Exit: /**************************************************************************** Desc: Truncate the file to the indicated size ****************************************************************************/ -RCODE FLMAPI F_FileHdl::truncateFile( +RCODE FTKAPI F_FileHdl::truncateFile( FLMUINT64 ui64NewSize) { RCODE rc = NE_FLM_OK; @@ -1004,7 +1004,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_FileHdl::lock( void) +RCODE FTKAPI F_FileHdl::lock( void) { RCODE rc = NE_FLM_OK; @@ -1022,7 +1022,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_FileHdl::unlock( void) +RCODE FTKAPI F_FileHdl::unlock( void) { RCODE rc = NE_FLM_OK; @@ -1040,7 +1040,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI f_yieldCPU( void) +void FTKAPI f_yieldCPU( void) { SleepEx( 0, true); } @@ -1048,7 +1048,7 @@ void FLMAPI f_yieldCPU( void) /********************************************************************** Desc: **********************************************************************/ -RCODE FLMAPI f_chdir( +RCODE FTKAPI f_chdir( const char * pszDir) { RCODE rc = NE_FLM_OK; @@ -1067,7 +1067,7 @@ Exit: /********************************************************************** Desc: **********************************************************************/ -RCODE FLMAPI f_getcwd( +RCODE FTKAPI f_getcwd( char * pszDir) { RCODE rc = NE_FLM_OK; diff --git a/ftk/src/ftkxml.cpp b/ftk/src/ftkxml.cpp index 40f0105..be921b9 100644 --- a/ftk/src/ftkxml.cpp +++ b/ftk/src/ftkxml.cpp @@ -425,7 +425,7 @@ void F_XML::setCharFlag( /**************************************************************************** Desc: Builds a character lookup table ****************************************************************************/ -RCODE FLMAPI F_XML::setup( void) +RCODE FTKAPI F_XML::setup( void) { RCODE rc = NE_FLM_OK; FLMUINT uiLoop; @@ -455,7 +455,7 @@ Exit: /**************************************************************************** Desc: Returns TRUE if the character is a valid XML PubID character ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isPubidChar( +FLMBOOL FTKAPI F_XML::isPubidChar( FLMUNICODE uChar) { if( uChar == FLM_UNICODE_SPACE || @@ -492,7 +492,7 @@ FLMBOOL FLMAPI F_XML::isPubidChar( /**************************************************************************** Desc: Returns TRUE if the character is a single or double quote character ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isQuoteChar( +FLMBOOL FTKAPI F_XML::isQuoteChar( FLMUNICODE uChar) { if( uChar == FLM_UNICODE_QUOTE || uChar == FLM_UNICODE_APOS) @@ -506,7 +506,7 @@ FLMBOOL FLMAPI F_XML::isQuoteChar( /**************************************************************************** Desc: Returns TRUE if the character is a whitespace character ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isWhitespace( +FLMBOOL FTKAPI F_XML::isWhitespace( FLMUNICODE uChar) { if( (m_pCharTable[ uChar].ucFlags & FLM_XML_WHITESPACE) != 0) @@ -520,7 +520,7 @@ FLMBOOL FLMAPI F_XML::isWhitespace( /**************************************************************************** Desc: Returns TRUE if the character is an extender character ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isExtender( +FLMBOOL FTKAPI F_XML::isExtender( FLMUNICODE uChar) { if( (m_pCharTable[ uChar].ucFlags & FLM_XML_EXTENDER) != 0) @@ -534,7 +534,7 @@ FLMBOOL FLMAPI F_XML::isExtender( /**************************************************************************** Desc: Returns TRUE if the character is a combining character ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isCombiningChar( +FLMBOOL FTKAPI F_XML::isCombiningChar( FLMUNICODE uChar) { if( (m_pCharTable[ uChar].ucFlags & FLM_XML_COMBINING_CHAR) != 0) @@ -548,7 +548,7 @@ FLMBOOL FLMAPI F_XML::isCombiningChar( /**************************************************************************** Desc: Returns TRUE if the character is a valid XML naming character ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isNCNameChar( +FLMBOOL FTKAPI F_XML::isNCNameChar( FLMUNICODE uChar) { if( isLetter( uChar) || @@ -567,7 +567,7 @@ FLMBOOL FLMAPI F_XML::isNCNameChar( /**************************************************************************** Desc: Returns TRUE if the character is a valid XML naming character ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isNameChar( +FLMBOOL FTKAPI F_XML::isNameChar( FLMUNICODE uChar) { if( isNCNameChar( uChar) || @@ -582,7 +582,7 @@ FLMBOOL FLMAPI F_XML::isNameChar( /**************************************************************************** Desc: Returns TRUE if the character is an ideographic character ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isIdeographic( +FLMBOOL FTKAPI F_XML::isIdeographic( FLMUNICODE uChar) { if( (m_pCharTable[ uChar].ucFlags & FLM_XML_IDEOGRAPHIC) != 0) @@ -596,7 +596,7 @@ FLMBOOL FLMAPI F_XML::isIdeographic( /**************************************************************************** Desc: Returns TRUE if the character is a base character ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isBaseChar( +FLMBOOL FTKAPI F_XML::isBaseChar( FLMUNICODE uChar) { if( (m_pCharTable[ uChar].ucFlags & FLM_XML_BASE_CHAR) != 0) @@ -610,7 +610,7 @@ FLMBOOL FLMAPI F_XML::isBaseChar( /**************************************************************************** Desc: Returns TRUE if the character is a digit ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isDigit( +FLMBOOL FTKAPI F_XML::isDigit( FLMUNICODE uChar) { if( (m_pCharTable[ uChar].ucFlags & FLM_XML_DIGIT) != 0) @@ -624,7 +624,7 @@ FLMBOOL FLMAPI F_XML::isDigit( /**************************************************************************** Desc: Returns TRUE if the character is a letter ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isLetter( +FLMBOOL FTKAPI F_XML::isLetter( FLMUNICODE uChar) { if( isBaseChar( uChar) || isIdeographic( uChar)) @@ -638,7 +638,7 @@ FLMBOOL FLMAPI F_XML::isLetter( /**************************************************************************** Desc: Returns TRUE if the name is a valid XML name ****************************************************************************/ -FLMBOOL FLMAPI F_XML::isNameValid( +FLMBOOL FTKAPI F_XML::isNameValid( FLMUNICODE * puzName, FLMBYTE * pszName) { diff --git a/ftk/util/ftktest.cpp b/ftk/util/ftktest.cpp index 681b0b4..a086c65 100644 --- a/ftk/util/ftktest.cpp +++ b/ftk/util/ftktest.cpp @@ -49,19 +49,19 @@ FSTATIC RCODE ftkTestAtomics( void); -FSTATIC RCODE FLMAPI ftkAtomicIncThread( +FSTATIC RCODE FTKAPI ftkAtomicIncThread( IF_Thread * pThread); -FSTATIC RCODE FLMAPI ftkAtomicIncMutexThread( +FSTATIC RCODE FTKAPI ftkAtomicIncMutexThread( IF_Thread * pThread); -FSTATIC RCODE FLMAPI ftkAtomicDecThread( +FSTATIC RCODE FTKAPI ftkAtomicDecThread( IF_Thread * pThread); -FSTATIC RCODE FLMAPI ftkAtomicIncDecThread( +FSTATIC RCODE FTKAPI ftkAtomicIncDecThread( IF_Thread * pThread); -FSTATIC RCODE FLMAPI ftkAtomicExchangeThread( +FSTATIC RCODE FTKAPI ftkAtomicExchangeThread( IF_Thread * pThread); FSTATIC RCODE ftkFastChecksumTest( void); @@ -4727,7 +4727,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -FSTATIC RCODE FLMAPI ftkAtomicIncThread( +FSTATIC RCODE FTKAPI ftkAtomicIncThread( IF_Thread * pThread) { FLMUINT uiLoop; @@ -4749,7 +4749,7 @@ FSTATIC RCODE FLMAPI ftkAtomicIncThread( /**************************************************************************** Desc: ****************************************************************************/ -FSTATIC RCODE FLMAPI ftkAtomicIncMutexThread( +FSTATIC RCODE FTKAPI ftkAtomicIncMutexThread( IF_Thread * pThread) { FLMUINT uiLoop; @@ -4773,7 +4773,7 @@ FSTATIC RCODE FLMAPI ftkAtomicIncMutexThread( /**************************************************************************** Desc: ****************************************************************************/ -FSTATIC RCODE FLMAPI ftkAtomicDecThread( +FSTATIC RCODE FTKAPI ftkAtomicDecThread( IF_Thread * pThread) { FLMUINT uiLoop; @@ -4795,7 +4795,7 @@ FSTATIC RCODE FLMAPI ftkAtomicDecThread( /**************************************************************************** Desc: ****************************************************************************/ -FSTATIC RCODE FLMAPI ftkAtomicIncDecThread( +FSTATIC RCODE FTKAPI ftkAtomicIncDecThread( IF_Thread * pThread) { FLMUINT uiLoop; @@ -4820,7 +4820,7 @@ FSTATIC RCODE FLMAPI ftkAtomicIncDecThread( /**************************************************************************** Desc: ****************************************************************************/ -FSTATIC RCODE FLMAPI ftkAtomicExchangeThread( +FSTATIC RCODE FTKAPI ftkAtomicExchangeThread( IF_Thread * pThread) { FLMUINT uiLoop; diff --git a/ftk/win32/ftk/flaimtk/flaimtk.vcproj b/ftk/win32/ftk/flaimtk/flaimtk.vcproj index 35928e8..45a737a 100644 --- a/ftk/win32/ftk/flaimtk/flaimtk.vcproj +++ b/ftk/win32/ftk/flaimtk/flaimtk.vcproj @@ -64,7 +64,7 @@ /> +// platform-specific API definitions for SQF* macros +#if defined( FLM_WIN) + #if defined( SQF_STATIC_LINK) + #define SQFEXP + #else + #if defined( SQF_SOURCE) + #define SQFEXP __declspec(dllexport) + #else + #define SQFEXP __declspec(dllimport) + #endif + #endif + #define SQFAPI __stdcall +#elif defined( FLM_NLM) + #define SQFEXP + #define SQFAPI __stdcall +#elif defined( FLM_UNIX) + #define SQFEXP + #define SQFAPI +#else + #error Platform not supported +#endif +#define SQFXPC extern "C" SQFEXP + // Forward declarations class F_Db; diff --git a/sql/src/flaimsys.h b/sql/src/flaimsys.h index 08de79b..fae3e8f 100644 --- a/sql/src/flaimsys.h +++ b/sql/src/flaimsys.h @@ -1205,17 +1205,17 @@ public: const void * pvBuffer, FLMUINT uiBytesToWrite); - virtual FLMINT FLMAPI getRefCount( void) + virtual FLMINT SQFAPI getRefCount( void) { return( IF_BackupClient::getRefCount()); } - virtual FLMINT FLMAPI AddRef( void) + virtual FLMINT SQFAPI AddRef( void) { return( IF_BackupClient::AddRef()); } - virtual FLMINT FLMAPI Release( void) + virtual FLMINT SQFAPI Release( void) { return( IF_BackupClient::Release()); } @@ -1261,17 +1261,17 @@ public: RCODE abortFile( void); - virtual FLMINT FLMAPI getRefCount( void) + virtual FLMINT SQFAPI getRefCount( void) { return( IF_RestoreClient::getRefCount()); } - virtual FLMINT FLMAPI AddRef( void) + virtual FLMINT SQFAPI AddRef( void) { return( IF_RestoreClient::AddRef()); } - virtual FLMINT FLMAPI Release( void) + virtual FLMINT SQFAPI Release( void) { return( IF_RestoreClient::Release()); } @@ -1480,17 +1480,17 @@ public: return( NE_SFLM_OK); } - virtual FLMINT FLMAPI getRefCount( void) + virtual FLMINT SQFAPI getRefCount( void) { return( IF_RestoreStatus::getRefCount()); } - virtual FLMINT FLMAPI AddRef( void) + virtual FLMINT SQFAPI AddRef( void) { return( IF_RestoreStatus::AddRef()); } - virtual FLMINT FLMAPI Release( void) + virtual FLMINT SQFAPI Release( void) { return( IF_RestoreStatus::Release()); } @@ -2734,7 +2734,7 @@ public: { } - FINLINE RCODE FLMAPI compare( + FINLINE RCODE SQFAPI compare( const void * pvKey1, FLMUINT uiKeyLen1, const void * pvKey2, @@ -2773,17 +2773,17 @@ public: m_pOldRow = pOldRow; } - virtual FLMINT FLMAPI getRefCount( void) + virtual FLMINT SQFAPI getRefCount( void) { return( IF_ResultSetCompare::getRefCount()); } - virtual FLMINT FLMAPI AddRef( void) + virtual FLMINT SQFAPI AddRef( void) { return( IF_ResultSetCompare::AddRef()); } - virtual FLMINT FLMAPI Release( void) + virtual FLMINT SQFAPI Release( void) { return( IF_ResultSetCompare::Release()); } @@ -2955,9 +2955,9 @@ public: { } - virtual FLMINT FLMAPI AddRef( void); + virtual FLMINT SQFAPI AddRef( void); - virtual FLMINT FLMAPI Release( void); + virtual FLMINT SQFAPI Release( void); RCODE init( void); @@ -3349,10 +3349,10 @@ private: const char * pszDestRflDir, IF_DbCopyStatus * ifpStatus); - static RCODE FLMAPI monitorThrd( + static RCODE SQFAPI monitorThrd( IF_Thread * pThread); - static RCODE FLMAPI cacheCleanupThrd( + static RCODE SQFAPI cacheCleanupThrd( IF_Thread * pThread); static void checkNotUsedObjects( void); @@ -3487,36 +3487,36 @@ public: FLMUINT32 ui32BlkAddr = 0, FLMUINT uiOffsetIndex = 0); - FINLINE FLMUINT64 FLMAPI totalSize( void) + FINLINE FLMUINT64 SQFAPI totalSize( void) { return( m_uiStreamSize); } - FINLINE FLMUINT64 FLMAPI remainingSize( void) + FINLINE FLMUINT64 SQFAPI remainingSize( void) { return( m_uiStreamSize - (m_uiBufferStartOffset + m_uiBufferOffset)); } - FINLINE RCODE FLMAPI closeStream( void) + FINLINE RCODE SQFAPI closeStream( void) { reset(); return( NE_SFLM_OK); } - RCODE FLMAPI positionTo( + RCODE SQFAPI positionTo( FLMUINT64 ui64Position); - FINLINE FLMUINT64 FLMAPI getCurrPosition( void) + FINLINE FLMUINT64 SQFAPI getCurrPosition( void) { return( m_uiBufferStartOffset + m_uiBufferOffset); } - RCODE FLMAPI read( + RCODE SQFAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FLMINT FLMAPI Release( void); + FLMINT SQFAPI Release( void); FINLINE FLMUINT32 getBlkAddr( void) { @@ -4403,7 +4403,7 @@ FINLINE RCODE F_RowCacheMgr::makeWriteCopy( /**************************************************************************** Desc: *****************************************************************************/ -class FLMEXP F_SuperFileClient : public IF_SuperFileClient +class SQFEXP F_SuperFileClient : public IF_SuperFileClient { public: @@ -4415,21 +4415,21 @@ public: const char * pszCFileName, const char * pszDataDir); - FLMUINT FLMAPI getFileNumber( + FLMUINT SQFAPI getFileNumber( FLMUINT uiBlockAddr); - FLMUINT FLMAPI getFileOffset( + FLMUINT SQFAPI getFileOffset( FLMUINT uiBlockAddr); - FLMUINT FLMAPI getBlockAddress( + FLMUINT SQFAPI getBlockAddress( FLMUINT uiFileNumber, FLMUINT uiFileOffset); - RCODE FLMAPI getFilePath( + RCODE SQFAPI getFilePath( FLMUINT uiFileNumber, char * pszPath); - FLMUINT64 FLMAPI getMaxFileSize( void); + FLMUINT64 SQFAPI getMaxFileSize( void); static void bldSuperFileExtension( FLMUINT uiFileNum, diff --git a/sql/src/flbackup.cpp b/sql/src/flbackup.cpp index e94fb86..7170ac8 100644 --- a/sql/src/flbackup.cpp +++ b/sql/src/flbackup.cpp @@ -86,10 +86,10 @@ private: RCODE _setup( void); - static RCODE FLMAPI readThread( + static RCODE SQFAPI readThread( IF_Thread * pThread); - static RCODE FLMAPI writeThread( + static RCODE SQFAPI writeThread( IF_Thread * pThread); // Data @@ -2495,7 +2495,7 @@ Exit: /**************************************************************************** Desc: This thread writes data in the background ****************************************************************************/ -RCODE FLMAPI F_BackerStream::writeThread( +RCODE SQFAPI F_BackerStream::writeThread( IF_Thread * pThread) { F_BackerStream * pBackerStream = (F_BackerStream *)pThread->getParm1(); diff --git a/sql/src/flindex.cpp b/sql/src/flindex.cpp index 5541a3d..05a6e75 100644 --- a/sql/src/flindex.cpp +++ b/sql/src/flindex.cpp @@ -25,7 +25,7 @@ #include "flaimsys.h" -FSTATIC RCODE FLMAPI flmBackgroundIndexBuildThrd( +FSTATIC RCODE SQFAPI flmBackgroundIndexBuildThrd( IF_Thread * pThread); /**************************************************************************** @@ -940,7 +940,7 @@ Desc: Thread that will build an index in the background. Caller will create a pDb to use. This pDb must be freed at the conclusion of the routine. ****************************************************************************/ -FSTATIC RCODE FLMAPI flmBackgroundIndexBuildThrd( +FSTATIC RCODE SQFAPI flmBackgroundIndexBuildThrd( IF_Thread * pThread) { RCODE rc = NE_SFLM_OK; diff --git a/sql/src/fslfileu.cpp b/sql/src/fslfileu.cpp index cd713d7..c863a21 100644 --- a/sql/src/fslfileu.cpp +++ b/sql/src/fslfileu.cpp @@ -796,7 +796,7 @@ Exit: Desc: Thread that will delete block chains from deleted indexes and tables in the background. ****************************************************************************/ -RCODE FLMAPI F_Database::maintenanceThread( +RCODE SQFAPI F_Database::maintenanceThread( IF_Thread * pThread) { RCODE rc = NE_SFLM_OK; diff --git a/sql/src/fstructs.h b/sql/src/fstructs.h index b5ecc47..1850b86 100644 --- a/sql/src/fstructs.h +++ b/sql/src/fstructs.h @@ -941,7 +941,7 @@ private: FLMBOOL bCounts, FLMBOOL bHaveData); - static RCODE FLMAPI maintenanceThread( + static RCODE SQFAPI maintenanceThread( IF_Thread * pThread); F_Database * m_pNext; // Next F_Database structure in in name hash diff --git a/sql/src/fsysdata.cpp b/sql/src/fsysdata.cpp index bfb6188..8790bab 100644 --- a/sql/src/fsysdata.cpp +++ b/sql/src/fsysdata.cpp @@ -814,7 +814,7 @@ Desc: This routine functions as a thread. It monitors open files and frees up files which have been closed longer than the maximum close time. ****************************************************************************/ -RCODE FLMAPI F_DbSystem::monitorThrd( +RCODE SQFAPI F_DbSystem::monitorThrd( IF_Thread * pThread) { FLMUINT uiLastUnusedCleanupTime = 0; @@ -3243,7 +3243,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_SuperFileClient::getFileNumber( +FLMUINT SQFAPI F_SuperFileClient::getFileNumber( FLMUINT uiBlockAddr) { return( FSGetFileNumber( uiBlockAddr)); @@ -3252,7 +3252,7 @@ FLMUINT FLMAPI F_SuperFileClient::getFileNumber( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_SuperFileClient::getFileOffset( +FLMUINT SQFAPI F_SuperFileClient::getFileOffset( FLMUINT uiBlockAddr) { return( FSGetFileOffset( uiBlockAddr)); @@ -3261,7 +3261,7 @@ FLMUINT FLMAPI F_SuperFileClient::getFileOffset( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_SuperFileClient::getBlockAddress( +FLMUINT SQFAPI F_SuperFileClient::getBlockAddress( FLMUINT uiFileNumber, FLMUINT uiFileOffset) { @@ -3272,7 +3272,7 @@ FLMUINT FLMAPI F_SuperFileClient::getBlockAddress( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT64 FLMAPI F_SuperFileClient::getMaxFileSize( void) +FLMUINT64 SQFAPI F_SuperFileClient::getMaxFileSize( void) { // JMC - FIXME: commented out due to missing functionality in flaimtk.h // if( m_uiDbVersion >= FLM_FILE_FORMAT_VER_4_3) @@ -3287,7 +3287,7 @@ FLMUINT64 FLMAPI F_SuperFileClient::getMaxFileSize( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_SuperFileClient::getFilePath( +RCODE SQFAPI F_SuperFileClient::getFilePath( FLMUINT uiFileNumber, char * pszPath) { diff --git a/sql/src/opendatabase.cpp b/sql/src/opendatabase.cpp index 4167d3c..54ac989 100644 --- a/sql/src/opendatabase.cpp +++ b/sql/src/opendatabase.cpp @@ -30,7 +30,7 @@ FSTATIC void flmFreeCPInfo( CP_INFO ** ppCPInfoRV); -FSTATIC RCODE FLMAPI flmCPThread( +FSTATIC RCODE SQFAPI flmCPThread( IF_Thread * pThread); /*************************************************************************** @@ -1856,7 +1856,7 @@ Desc: This routine functions as a thread. It monitors open files and frees up files which have been closed longer than the maximum close time. ****************************************************************************/ -FSTATIC RCODE FLMAPI flmCPThread( +FSTATIC RCODE SQFAPI flmCPThread( IF_Thread * pThread) { CP_INFO * pCPInfo = (CP_INFO *)pThread->getParm1(); diff --git a/sql/src/scache.cpp b/sql/src/scache.cpp index f0205d8..94d956b 100644 --- a/sql/src/scache.cpp +++ b/sql/src/scache.cpp @@ -33,7 +33,7 @@ FSTATIC void ScaNotify( F_CachedBlock * pUseSCache, RCODE NotifyRc); -FSTATIC void FLMAPI scaWriteComplete( +FSTATIC void SQFAPI scaWriteComplete( IF_IOBuffer * pIOBuffer, void * pvData); @@ -66,7 +66,7 @@ FINLINE FLMINT scaCompare( Desc: Compare two cache blocks during a sort to determine which one has lower address. *****************************************************************************/ -FINLINE FLMINT FLMAPI scaSortCompare( +FINLINE FLMINT SQFAPI scaSortCompare( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -78,7 +78,7 @@ FINLINE FLMINT FLMAPI scaSortCompare( /*************************************************************************** Desc: Swap two entries in cache table during sort. *****************************************************************************/ -FINLINE void FLMAPI scaSortSwap( +FINLINE void SQFAPI scaSortSwap( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -1836,7 +1836,7 @@ Desc: This routine is called whenever a write of a dirty block completes. /**************************************************************************** Desc: This routine is called whenever a write of a dirty block completes. ****************************************************************************/ -FSTATIC void FLMAPI scaWriteComplete( +FSTATIC void SQFAPI scaWriteComplete( IF_IOBuffer * pIOBuffer, void * pvData) { @@ -7684,7 +7684,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_CachedBlock::objectAllocInit( +void SQFAPI F_CachedBlock::objectAllocInit( void * pvAlloc, FLMUINT uiSize) { diff --git a/sql/src/sqlstatement.h b/sql/src/sqlstatement.h index 3f0e729..f5c9b20 100644 --- a/sql/src/sqlstatement.h +++ b/sql/src/sqlstatement.h @@ -90,12 +90,12 @@ public: } } - FINLINE FLMINT FLMAPI AddRef( void) + FINLINE FLMINT SQFAPI AddRef( void) { return( f_atomicInc( &m_refCnt)); } - FINLINE FLMINT FLMAPI Release( void) + FINLINE FLMINT SQFAPI Release( void) { FLMINT iRefCnt; diff --git a/sql/src/translog.cpp b/sql/src/translog.cpp index 6ec5aaa..0a28d6c 100644 --- a/sql/src/translog.cpp +++ b/sql/src/translog.cpp @@ -25,7 +25,7 @@ #include "flaimsys.h" -FSTATIC void FLMAPI lgWriteComplete( +FSTATIC void SQFAPI lgWriteComplete( IF_IOBuffer * pIOBuffer, void * pvData); @@ -70,7 +70,7 @@ void scaLogWrite( Desc: This is the callback routine that is called when a disk write is completed. ****************************************************************************/ -FSTATIC void FLMAPI lgWriteComplete( +FSTATIC void SQFAPI lgWriteComplete( IF_IOBuffer * pIOBuffer, void * pvData) { diff --git a/sql/win32/sql/flaimsql/flaimsql.vcproj b/sql/win32/sql/flaimsql/flaimsql.vcproj index 4c910d6..09c1a1a 100644 --- a/sql/win32/sql/flaimsql/flaimsql.vcproj +++ b/sql/win32/sql/flaimsql/flaimsql.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\ftk\src" - PreprocessorDefinitions="WIN32;_WINDLL;_DEBUG;_WINDOWS;_USRDLL;FLM_DEBUG;FLM_SOURCE;$(NOINHERIT)" + PreprocessorDefinitions="WIN32;_WINDLL;_DEBUG;_WINDOWS;_USRDLL;FLM_DEBUG;SQF_SOURCE;$(NOINHERIT)" StringPooling="true" MinimalRebuild="false" BasicRuntimeChecks="3" @@ -64,9 +64,9 @@ /> lockMutex(); @@ -518,7 +518,7 @@ void FLMAPI F_Db::getCheckpointInfo( /**************************************************************************** Desc: Returns current RFL file number ****************************************************************************/ -RCODE FLMAPI F_Db::getRflFileNum( +RCODE XFLAPI F_Db::getRflFileNum( FLMUINT * puiRflFileNum ) { @@ -576,7 +576,7 @@ Exit: /**************************************************************************** Desc: Returns highest not used RFL file number ****************************************************************************/ -RCODE FLMAPI F_Db::getHighestNotUsedRflFileNum( +RCODE XFLAPI F_Db::getHighestNotUsedRflFileNum( FLMUINT * puiHighestNotUsedRflFileNum ) { @@ -633,7 +633,7 @@ Exit: /**************************************************************************** Desc: Returns RFL file size limits for the database ****************************************************************************/ -RCODE FLMAPI F_Db::getRflFileSizeLimits( +RCODE XFLAPI F_Db::getRflFileSizeLimits( FLMUINT * puiRflMinFileSize, FLMUINT * puiRflMaxFileSize ) @@ -687,7 +687,7 @@ Exit: /**************************************************************************** Desc: Returns RFL keep flag for the database ****************************************************************************/ -RCODE FLMAPI F_Db::getRflKeepFlag( +RCODE XFLAPI F_Db::getRflKeepFlag( FLMBOOL * pbKeep ) { @@ -733,7 +733,7 @@ Exit: /**************************************************************************** Desc: Returns last backup transaction ID for the database ****************************************************************************/ -RCODE FLMAPI F_Db::getLastBackupTransID( +RCODE XFLAPI F_Db::getLastBackupTransID( FLMUINT64 * pui64LastBackupTransID ) { @@ -778,7 +778,7 @@ Exit: /**************************************************************************** Desc: Returns blocks changed since the last backup for the database ****************************************************************************/ -RCODE FLMAPI F_Db::getBlocksChangedSinceBackup( +RCODE XFLAPI F_Db::getBlocksChangedSinceBackup( FLMUINT * puiBlocksChangedSinceBackup ) { @@ -823,7 +823,7 @@ Exit: /**************************************************************************** Desc: Returns the auto-turn-off-keep-RFL flag for the database ****************************************************************************/ -RCODE FLMAPI F_Db::getAutoTurnOffKeepRflFlag( +RCODE XFLAPI F_Db::getAutoTurnOffKeepRflFlag( FLMBOOL * pbAutoTurnOff ) { @@ -869,7 +869,7 @@ Exit: /**************************************************************************** Desc: Returns the keep aborted transactions in RFL flag for the database ****************************************************************************/ -RCODE FLMAPI F_Db::getKeepAbortedTransInRflFlag( +RCODE XFLAPI F_Db::getKeepAbortedTransInRflFlag( FLMBOOL * pbKeep ) { @@ -915,7 +915,7 @@ Exit: /**************************************************************************** Desc: Returns disk space usage for the database ****************************************************************************/ -RCODE FLMAPI F_Db::getDiskSpaceUsage( +RCODE XFLAPI F_Db::getDiskSpaceUsage( FLMUINT64 * pui64DataSize, FLMUINT64 * pui64RollbackSize, FLMUINT64 * pui64RflSize) @@ -1216,7 +1216,7 @@ Exit: /**************************************************************************** Desc: Returns the next incremental backup sequence number for the database ****************************************************************************/ -RCODE FLMAPI F_Db::getNextIncBackupSequenceNum( +RCODE XFLAPI F_Db::getNextIncBackupSequenceNum( FLMUINT * puiNextIncBackupSequenceNum ) { @@ -1262,7 +1262,7 @@ Exit: Desc: Returns list of lock waiters in an object that allows caller to iterate through the list. ****************************************************************************/ -RCODE FLMAPI F_Db::getLockWaiters( +RCODE XFLAPI F_Db::getLockWaiters( IF_LockInfoClient * pLockInfo ) { @@ -1282,7 +1282,7 @@ RCODE FLMAPI F_Db::getLockWaiters( /**************************************************************************** Desc: Returns RFL directory for the database ****************************************************************************/ -void FLMAPI F_Db::getRflDir( +void XFLAPI F_Db::getRflDir( char * pszRflDir ) { @@ -1294,7 +1294,7 @@ void FLMAPI F_Db::getRflDir( /**************************************************************************** Desc: Returns database serial number ****************************************************************************/ -void FLMAPI F_Db::getSerialNumber( +void XFLAPI F_Db::getSerialNumber( char * pucSerialNumber) { m_pDatabase->lockMutex(); diff --git a/xflaim/src/fdllmain.cpp b/xflaim/src/fdllmain.cpp index def3622..a9a6d90 100644 --- a/xflaim/src/fdllmain.cpp +++ b/xflaim/src/fdllmain.cpp @@ -27,9 +27,9 @@ static FLMATOMIC gv_lockCount = 0; -FLMEXTC RCODE FLMAPI DllCanUnloadNow( void); -FLMEXTC RCODE FLMAPI DllStart( void); -FLMEXTC RCODE FLMAPI DllStop( void); +XFLXPC RCODE XFLAPI DllCanUnloadNow( void); +XFLXPC RCODE XFLAPI DllStart( void); +XFLXPC RCODE XFLAPI DllStop( void); #if defined( FLM_UNIX) @@ -67,7 +67,7 @@ void UnlockModule(void) Desc: Returns 0 if it's okay to unload, or a non-zero status code if not. ******************************************************************************/ -FLMEXTC RCODE FLMAPI DllCanUnloadNow( void) +XFLXPC RCODE XFLAPI DllCanUnloadNow( void) { if( gv_lockCount > 1) { @@ -81,7 +81,7 @@ FLMEXTC RCODE FLMAPI DllCanUnloadNow( void) Desc: Called by PSA when it loads the library. Must return 0 for success, or a non-zero error code. ******************************************************************************/ -FLMEXTC RCODE FLMAPI DllStart( void) +XFLXPC RCODE XFLAPI DllStart( void) { return( NE_XFLM_OK); } @@ -90,7 +90,7 @@ FLMEXTC RCODE FLMAPI DllStart( void) Desc: Called by PSA when it unloads the library. The return value is ignored. ******************************************************************************/ -FLMEXTC RCODE FLMAPI DllStop( void) +XFLXPC RCODE XFLAPI DllStop( void) { return( NE_XFLM_OK); } @@ -98,7 +98,7 @@ FLMEXTC RCODE FLMAPI DllStop( void) /****************************************************************************** Desc: ******************************************************************************/ -FLMEXTC RCODE FLMAPI DllRegisterServer( +XFLXPC RCODE XFLAPI DllRegisterServer( const char *) { return( NE_XFLM_OK); @@ -107,7 +107,7 @@ FLMEXTC RCODE FLMAPI DllRegisterServer( /****************************************************************************** Desc: ******************************************************************************/ -FLMEXTC RCODE FLMAPI DllUnregisterServer( void) +XFLXPC RCODE XFLAPI DllUnregisterServer( void) { return( NE_XFLM_OK); } diff --git a/xflaim/src/fdom.cpp b/xflaim/src/fdom.cpp index ef08cd3..bf7f560 100644 --- a/xflaim/src/fdom.cpp +++ b/xflaim/src/fdom.cpp @@ -80,12 +80,12 @@ public: { } - RCODE FLMAPI read( + RCODE XFLAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FINLINE RCODE FLMAPI closeStream( void) + FINLINE RCODE XFLAPI closeStream( void) { return( NE_XFLM_OK); } @@ -102,7 +102,7 @@ private: /***************************************************************************** Desc: ******************************************************************************/ -FLMINT FLMAPI F_BTreeIStream::Release( void) +FLMINT XFLAPI F_BTreeIStream::Release( void) { FLMATOMIC refCnt = --m_refCnt; @@ -199,7 +199,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -FLMINT FLMAPI F_DOMNode::Release( void) +FLMINT XFLAPI F_DOMNode::Release( void) { FLMINT iRefCnt = --m_refCnt; @@ -941,7 +941,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getDataLength( +RCODE XFLAPI F_DOMNode::getDataLength( IF_Db * ifpDb, FLMUINT * puiLength) { @@ -1015,7 +1015,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::insertBefore( +RCODE XFLAPI F_DOMNode::insertBefore( IF_Db * ifpDb, IF_DOMNode * ifpNewChild, IF_DOMNode * ifpRefChild) @@ -2548,7 +2548,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::setMetaValue( +RCODE XFLAPI F_DOMNode::setMetaValue( IF_Db * ifpDb, FLMUINT64 ui64Value) { @@ -2651,7 +2651,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getMetaValue( +RCODE XFLAPI F_DOMNode::getMetaValue( IF_Db * ifpDb, FLMUINT64 * pui64Value) { @@ -2685,7 +2685,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::isDataLocalToNode( +RCODE XFLAPI F_DOMNode::isDataLocalToNode( IF_Db * ifpDb, FLMBOOL * pbDataIsLocal) { @@ -2812,12 +2812,12 @@ public: closeStream(); } - RCODE FLMAPI read( + RCODE XFLAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FINLINE RCODE FLMAPI closeStream( void) + FINLINE RCODE XFLAPI closeStream( void) { if( m_pIStream) { @@ -2965,12 +2965,12 @@ public: closeStream(); } - RCODE FLMAPI read( + RCODE XFLAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FINLINE RCODE FLMAPI closeStream( void) + FINLINE RCODE XFLAPI closeStream( void) { if( m_pEncoderStream) { @@ -5413,7 +5413,7 @@ Exit: /***************************************************************************** Desc: Allocate data for a unicode element and retrieve it. *****************************************************************************/ -RCODE FLMAPI F_DOMNode::getUnicode( +RCODE XFLAPI F_DOMNode::getUnicode( IF_Db * ifpDb, FLMUNICODE ** ppuzUnicode) { @@ -5475,7 +5475,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getUnicode( +RCODE XFLAPI F_DOMNode::getUnicode( IF_Db * ifpDb, FLMUNICODE * puzBuffer, FLMUINT uiBufSize, @@ -5538,7 +5538,7 @@ Exit: /***************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_DOMNode::getUnicode( +RCODE XFLAPI F_DOMNode::getUnicode( IF_Db * ifpDb, F_DynaBuf * pBuffer) { @@ -5587,7 +5587,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getUTF8( +RCODE XFLAPI F_DOMNode::getUTF8( IF_Db * ifpDb, FLMBYTE * pszValue, FLMUINT uiBufferSize, @@ -5756,7 +5756,7 @@ Exit: /***************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_DOMNode::getUTF8( +RCODE XFLAPI F_DOMNode::getUTF8( IF_Db * ifpDb, FLMBYTE ** ppszUTF8) { @@ -5808,7 +5808,7 @@ Exit: /***************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_DOMNode::getUTF8( +RCODE XFLAPI F_DOMNode::getUTF8( IF_Db * ifpDb, F_DynaBuf * pBuffer) { @@ -5856,7 +5856,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getBinary( +RCODE XFLAPI F_DOMNode::getBinary( IF_Db * ifpDb, void * pvValue, FLMUINT uiByteOffset, @@ -5970,7 +5970,7 @@ Exit: /***************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_DOMNode::getBinary( +RCODE XFLAPI F_DOMNode::getBinary( IF_Db * ifpDb, F_DynaBuf * pBuffer) { @@ -6181,7 +6181,7 @@ Exit: /***************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_DOMNode::getAttributeValueUnicode( +RCODE XFLAPI F_DOMNode::getAttributeValueUnicode( IF_Db * ifpDb, FLMUINT uiAttrName, F_DynaBuf * pBuffer) @@ -6217,7 +6217,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getAttributeValueUnicode( +RCODE XFLAPI F_DOMNode::getAttributeValueUnicode( IF_Db * ifpDb, FLMUINT uiAttrName, FLMUNICODE ** ppuzUnicode) @@ -6257,7 +6257,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getAttributeValueUTF8( +RCODE XFLAPI F_DOMNode::getAttributeValueUTF8( IF_Db * ifpDb, FLMUINT uiAttrName, FLMBYTE ** ppszValue) @@ -6297,7 +6297,7 @@ Exit: /***************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_DOMNode::getAttributeValueUTF8( +RCODE XFLAPI F_DOMNode::getAttributeValueUTF8( IF_Db * ifpDb, FLMUINT uiAttrName, F_DynaBuf * pBuffer) @@ -6333,7 +6333,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getAttributeValueBinary( +RCODE XFLAPI F_DOMNode::getAttributeValueBinary( IF_Db * ifpDb, FLMUINT uiAttrName, void * pvValue, @@ -6379,7 +6379,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getAttributeValueBinary( +RCODE XFLAPI F_DOMNode::getAttributeValueBinary( IF_Db * ifpDb, FLMUINT uiAttrName, F_DynaBuf * pBuffer) @@ -6553,7 +6553,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::setAttributeValueUnicode( +RCODE XFLAPI F_DOMNode::setAttributeValueUnicode( IF_Db * ifpDb, FLMUINT uiAttrName, const FLMUNICODE * puzValue, @@ -6617,7 +6617,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::setAttributeValueBinary( +RCODE XFLAPI F_DOMNode::setAttributeValueBinary( IF_Db * ifpDb, FLMUINT uiAttrName, const void * pvValue, @@ -6734,7 +6734,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::setAttributeValueUTF8( +RCODE XFLAPI F_DOMNode::setAttributeValueUTF8( IF_Db * ifpDb, FLMUINT uiAttrName, const FLMBYTE * pucValue, @@ -7468,7 +7468,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::deleteAttribute( +RCODE XFLAPI F_DOMNode::deleteAttribute( IF_Db * ifpDb, FLMUINT uiAttrName) { @@ -7665,7 +7665,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::hasAttribute( +RCODE XFLAPI F_DOMNode::hasAttribute( IF_Db * ifpDb, FLMUINT uiNameId, IF_DOMNode ** ifppAttr) @@ -8269,7 +8269,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::createChildElement( +RCODE XFLAPI F_DOMNode::createChildElement( IF_Db * ifpDb, FLMUINT uiNameId, eNodeInsertLoc eLocation, @@ -8778,7 +8778,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::hasAnnotation( +RCODE XFLAPI F_DOMNode::hasAnnotation( IF_Db * ifpDb, FLMBOOL * pbHasAnnotation) { @@ -8861,7 +8861,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getDocumentId( +RCODE XFLAPI F_DOMNode::getDocumentId( IF_Db * ifpDb, FLMUINT64 * pui64DocId) { @@ -8895,7 +8895,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getNodeId( +RCODE XFLAPI F_DOMNode::getNodeId( IF_Db * ifpDb, FLMUINT64 * pui64NodeId) { @@ -8978,7 +8978,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getParentId( +RCODE XFLAPI F_DOMNode::getParentId( IF_Db * ifpDb, FLMUINT64 * pui64ParentId) { @@ -9013,7 +9013,7 @@ Exit: Desc: COM version of the getPrevSibId method. This method ensures that the DOM node is up-to-date. ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getPrevSibId( +RCODE XFLAPI F_DOMNode::getPrevSibId( IF_Db * ifpDb, FLMUINT64 * pui64PrevSibId) { @@ -9055,7 +9055,7 @@ Exit: Desc: COM version of the getNextSibId method. This method ensures that the DOM node is up-to-date. ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getNextSibId( +RCODE XFLAPI F_DOMNode::getNextSibId( IF_Db * ifpDb, FLMUINT64 * pui64NextSibId) { @@ -9096,7 +9096,7 @@ Exit: Desc: COM version of the getFirstChildId method. This method ensures that the DOM node is up-to-date. ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getFirstChildId( +RCODE XFLAPI F_DOMNode::getFirstChildId( IF_Db * ifpDb, FLMUINT64 * pui64FirstChildId) { @@ -9138,7 +9138,7 @@ Exit: Desc: COM version of the getLastChildId method. This method ensures that the DOM node is up-to-date. ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getLastChildId( +RCODE XFLAPI F_DOMNode::getLastChildId( IF_Db * ifpDb, FLMUINT64 * pui64LastChildId) { @@ -9178,7 +9178,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::isNamespaceDecl( +RCODE XFLAPI F_DOMNode::isNamespaceDecl( IF_Db * ifpDb, FLMBOOL * pbIsNamespaceDecl) { @@ -9442,7 +9442,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getPrefixId( +RCODE XFLAPI F_DOMNode::getPrefixId( IF_Db * ifpDb, FLMUINT * puiPrefixId) { @@ -9628,7 +9628,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getAncestorElement( +RCODE XFLAPI F_DOMNode::getAncestorElement( IF_Db * ifpDb, FLMUINT uiNameId, IF_DOMNode ** ifppAncestor) @@ -9712,7 +9712,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getDescendantElement( +RCODE XFLAPI F_DOMNode::getDescendantElement( IF_Db * ifpDb, FLMUINT uiNameId, IF_DOMNode ** ifppDescendant) @@ -9824,7 +9824,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getDocumentNode( +RCODE XFLAPI F_DOMNode::getDocumentNode( IF_Db * ifpDb, IF_DOMNode ** ifppDoc) { @@ -9877,7 +9877,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getParentNode( +RCODE XFLAPI F_DOMNode::getParentNode( IF_Db * ifpDb, IF_DOMNode ** ifppParent) { @@ -9921,7 +9921,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getFirstChild( +RCODE XFLAPI F_DOMNode::getFirstChild( IF_Db * ifpDb, IF_DOMNode ** ifppChild) { @@ -9965,7 +9965,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getLastChild( +RCODE XFLAPI F_DOMNode::getLastChild( IF_Db * ifpDb, IF_DOMNode ** ifppChild) { @@ -10009,7 +10009,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getChild( +RCODE XFLAPI F_DOMNode::getChild( IF_Db * ifpDb, eDomNodeType eNodeType, IF_DOMNode ** ppChild) @@ -10105,7 +10105,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getChildElement( +RCODE XFLAPI F_DOMNode::getChildElement( IF_Db * ifpDb, FLMUINT uiNameId, IF_DOMNode ** ppChild, @@ -10250,7 +10250,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getSiblingElement( +RCODE XFLAPI F_DOMNode::getSiblingElement( IF_Db * ifpDb, FLMUINT uiNameId, FLMBOOL bNext, @@ -10339,7 +10339,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getPreviousSibling( +RCODE XFLAPI F_DOMNode::getPreviousSibling( IF_Db * ifpDb, IF_DOMNode ** ifppSib) { @@ -10400,7 +10400,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getNextSibling( +RCODE XFLAPI F_DOMNode::getNextSibling( IF_Db * ifpDb, IF_DOMNode ** ifppSib) { @@ -10461,7 +10461,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getPreviousDocument( +RCODE XFLAPI F_DOMNode::getPreviousDocument( IF_Db * ifpDb, IF_DOMNode ** ifppDoc) { @@ -10631,7 +10631,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_DOMNode::getNextDocument( +RCODE XFLAPI F_DOMNode::getNextDocument( IF_Db * ifpDb, IF_DOMNode ** ifppDoc) { @@ -11840,7 +11840,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_BTreeIStream::positionTo( +RCODE XFLAPI F_BTreeIStream::positionTo( FLMUINT64 ui64Position) { RCODE rc = NE_XFLM_OK; @@ -12544,7 +12544,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_DOMNode::getQualifiedName( +RCODE XFLAPI F_DOMNode::getQualifiedName( IF_Db * ifpDb, FLMUNICODE * puzQualifiedName, FLMUINT uiBufSize, @@ -12621,7 +12621,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_DOMNode::getQualifiedName( +RCODE XFLAPI F_DOMNode::getQualifiedName( IF_Db * ifpDb, char * pszQualifiedName, FLMUINT uiBufSize, @@ -12802,7 +12802,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_DOMNode::setPrefixId( +RCODE XFLAPI F_DOMNode::setPrefixId( IF_Db * ifpDb, FLMUINT uiPrefixId) { @@ -12951,7 +12951,7 @@ Exit: /**************************************************************************** Desc: Method to compare two dom nodes. *****************************************************************************/ -FLMUINT FLMAPI F_DOMNode::compareNode( +FLMUINT XFLAPI F_DOMNode::compareNode( IF_DOMNode * pNode, IF_Db * pDb1, IF_Db * pDb2, @@ -13376,7 +13376,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_Db::getDictionaryDef( +RCODE XFLAPI F_Db::getDictionaryDef( FLMUINT uiDictType, FLMUINT uiDictNumber, IF_DOMNode ** ppDocumentNode) @@ -13430,7 +13430,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_Db::getElementNameId( +RCODE XFLAPI F_Db::getElementNameId( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzElementName, FLMUINT * puiElementNameId) @@ -13474,7 +13474,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_Db::getElementNameId( +RCODE XFLAPI F_Db::getElementNameId( const char * pszNamespaceURI, const char * pszElementName, FLMUINT * puiElementNameId) @@ -13547,7 +13547,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_Db::getAttributeNameId( +RCODE XFLAPI F_Db::getAttributeNameId( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzAttributeName, FLMUINT * puiAttributeNameId) @@ -13591,7 +13591,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_Db::getAttributeNameId( +RCODE XFLAPI F_Db::getAttributeNameId( const char * pszNamespaceURI, const char * pszAttributeName, FLMUINT * puiAttributeNameId) @@ -13664,7 +13664,7 @@ Exit: /***************************************************************************** Desc: Get a collection number from collection name. ******************************************************************************/ -RCODE FLMAPI F_Db::getCollectionNumber( +RCODE XFLAPI F_Db::getCollectionNumber( const char * pszCollectionName, FLMUINT * puiCollectionNumber) { @@ -13707,7 +13707,7 @@ Exit: /***************************************************************************** Desc: Get a collection number from collection name. ******************************************************************************/ -RCODE FLMAPI F_Db::getCollectionNumber( +RCODE XFLAPI F_Db::getCollectionNumber( const FLMUNICODE * puzCollectionName, FLMUINT * puiCollectionNumber) { @@ -13750,7 +13750,7 @@ Exit: /***************************************************************************** Desc: Get an index number from index name. ******************************************************************************/ -RCODE FLMAPI F_Db::getIndexNumber( +RCODE XFLAPI F_Db::getIndexNumber( const char * pszIndexName, FLMUINT * puiIndexNumber) { @@ -13793,7 +13793,7 @@ Exit: /***************************************************************************** Desc: Get an index number from index name. ******************************************************************************/ -RCODE FLMAPI F_Db::getIndexNumber( +RCODE XFLAPI F_Db::getIndexNumber( const FLMUNICODE * puzIndexName, FLMUINT * puiIndexNumber) { @@ -14919,7 +14919,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_Db::getAttribute( +RCODE XFLAPI F_Db::getAttribute( FLMUINT uiCollection, FLMUINT64 ui64ElementId, FLMUINT uiAttrName, @@ -15001,7 +15001,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_Db::getFirstDocument( +RCODE XFLAPI F_Db::getFirstDocument( FLMUINT uiCollection, IF_DOMNode ** ppDocumentNode) { @@ -15044,7 +15044,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_Db::getLastDocument( +RCODE XFLAPI F_Db::getLastDocument( FLMUINT uiCollection, IF_DOMNode ** ppDocumentNode) { @@ -15087,7 +15087,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_Db::getDocument( +RCODE XFLAPI F_Db::getDocument( FLMUINT uiCollection, FLMUINT uiFlags, FLMUINT64 ui64DocumentId, @@ -16157,7 +16157,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_Db::getPrefixId( +RCODE XFLAPI F_Db::getPrefixId( const FLMUNICODE * puzPrefixName, FLMUINT * puiPrefixNumber) { @@ -16188,7 +16188,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_Db::getPrefixId( +RCODE XFLAPI F_Db::getPrefixId( const char * pszPrefixName, FLMUINT * puiPrefixNumber) { @@ -16219,7 +16219,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_Db::getEncDefId( +RCODE XFLAPI F_Db::getEncDefId( const char * pszEncDefName, FLMUINT * puiEncDefNumber) { @@ -16250,7 +16250,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_Db::getEncDefId( +RCODE XFLAPI F_Db::getEncDefId( const FLMUNICODE * puzEncDefName, FLMUINT * puiEncDefNumber) { @@ -17964,7 +17964,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_NodeBufferIStream::openStream( +RCODE XFLAPI F_NodeBufferIStream::openStream( const char * pucBuffer, FLMUINT uiLength, char ** ppucAllocatedBuffer) diff --git a/xflaim/src/flaimsys.h b/xflaim/src/flaimsys.h index 0129bbe..54f24ac 100644 --- a/xflaim/src/flaimsys.h +++ b/xflaim/src/flaimsys.h @@ -499,9 +499,9 @@ public: return m_bLoadedAllAttributes; } - virtual FLMINT FLMAPI AddRef( void); + virtual FLMINT XFLAPI AddRef( void); - virtual FLMINT FLMAPI Release( void); + virtual FLMINT XFLAPI Release( void); private: @@ -755,48 +755,48 @@ public: // Setter methods - FINLINE void FLMAPI setDocumentID( + FINLINE void XFLAPI setDocumentID( FLMUINT64 ui64DocumentID) { m_ui64DocumentID = ui64DocumentID; } - RCODE FLMAPI setID( + RCODE XFLAPI setID( FLMUINT uiElementNumber, FLMUINT64 ui64ID); - RCODE FLMAPI setNameId( + RCODE XFLAPI setNameId( FLMUINT uiElementNumber, FLMUINT uiNameId, FLMBOOL bIsAttr, FLMBOOL bIsData); - RCODE FLMAPI setINT( + RCODE XFLAPI setINT( FLMUINT uiElementNumber, FLMINT iNum); - RCODE FLMAPI setINT64( + RCODE XFLAPI setINT64( FLMUINT uiElementNumber, FLMINT64 i64Num); - RCODE FLMAPI setUINT( + RCODE XFLAPI setUINT( FLMUINT uiElementNumber, FLMUINT uiNum); - RCODE FLMAPI setUINT64( + RCODE XFLAPI setUINT64( FLMUINT uiElementNumber, FLMUINT64 ui64Num); - RCODE FLMAPI setUnicode( + RCODE XFLAPI setUnicode( FLMUINT uiElementNumber, const FLMUNICODE * puzUnicode); - RCODE FLMAPI setUTF8( + RCODE XFLAPI setUTF8( FLMUINT uiElementNumber, const FLMBYTE * pszUtf8, FLMUINT uiBytesInBuffer = 0); - FINLINE RCODE FLMAPI setBinary( + FINLINE RCODE XFLAPI setBinary( FLMUINT uiElementNumber, const void * pvBinary, FLMUINT uiBinaryLen) @@ -805,7 +805,7 @@ public: XFLM_BINARY_TYPE, (FLMBYTE *)pvBinary, uiBinaryLen)); } - FINLINE void FLMAPI setRightTruncated( + FINLINE void XFLAPI setRightTruncated( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -822,7 +822,7 @@ public: } } - FINLINE void FLMAPI setLeftTruncated( + FINLINE void XFLAPI setLeftTruncated( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -839,7 +839,7 @@ public: } } - FINLINE void FLMAPI clearRightTruncated( + FINLINE void XFLAPI clearRightTruncated( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -856,7 +856,7 @@ public: } } - FINLINE void FLMAPI clearLeftTruncated( + FINLINE void XFLAPI clearLeftTruncated( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -873,7 +873,7 @@ public: } } - FINLINE FLMBOOL FLMAPI isRightTruncated( + FINLINE FLMBOOL XFLAPI isRightTruncated( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -886,7 +886,7 @@ public: return( FALSE); } - FINLINE FLMBOOL FLMAPI isLeftTruncated( + FINLINE FLMBOOL XFLAPI isLeftTruncated( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -901,12 +901,12 @@ public: // Getter methods - FINLINE FLMUINT64 FLMAPI getDocumentID( void) + FINLINE FLMUINT64 XFLAPI getDocumentID( void) { return( m_ui64DocumentID); } - FINLINE FLMUINT64 FLMAPI getID( + FINLINE FLMUINT64 XFLAPI getID( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -921,7 +921,7 @@ public: } } - FINLINE FLMUINT FLMAPI getNameId( + FINLINE FLMUINT XFLAPI getNameId( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -936,7 +936,7 @@ public: } } - FINLINE FLMBOOL FLMAPI isAttr( + FINLINE FLMBOOL XFLAPI isAttr( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -951,7 +951,7 @@ public: } } - FINLINE FLMBOOL FLMAPI isDataComponent( + FINLINE FLMBOOL XFLAPI isDataComponent( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -966,7 +966,7 @@ public: } } - FINLINE FLMBOOL FLMAPI isKeyComponent( + FINLINE FLMBOOL XFLAPI isKeyComponent( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -981,7 +981,7 @@ public: } } - FLMUINT FLMAPI getDataLength( + FLMUINT XFLAPI getDataLength( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -996,7 +996,7 @@ public: } } - FLMUINT FLMAPI getDataType( + FLMUINT XFLAPI getDataType( FLMUINT uiElementNumber) { F_VECTOR_ELEMENT * pVector; @@ -1011,12 +1011,12 @@ public: } } - RCODE FLMAPI getUTF8Ptr( + RCODE XFLAPI getUTF8Ptr( FLMUINT uiElementNumber, const FLMBYTE ** ppszUTF8, FLMUINT * puiBufLen); - FINLINE RCODE FLMAPI getINT( + FINLINE RCODE XFLAPI getINT( FLMUINT uiElementNumber, FLMINT * piNum) { @@ -1031,7 +1031,7 @@ public: : RC_SET( NE_XFLM_NOT_FOUND))); } - FINLINE RCODE FLMAPI getINT64( + FINLINE RCODE XFLAPI getINT64( FLMUINT uiElementNumber, FLMINT64 * pi64Num) { @@ -1046,7 +1046,7 @@ public: : RC_SET( NE_XFLM_NOT_FOUND))); } - FINLINE RCODE FLMAPI getUINT( + FINLINE RCODE XFLAPI getUINT( FLMUINT uiElementNumber, FLMUINT * puiNum) { @@ -1061,7 +1061,7 @@ public: : RC_SET( NE_XFLM_NOT_FOUND))); } - FINLINE RCODE FLMAPI getUINT64( + FINLINE RCODE XFLAPI getUINT64( FLMUINT uiElementNumber, FLMUINT64 * pui64Num) { @@ -1076,11 +1076,11 @@ public: : RC_SET( NE_XFLM_NOT_FOUND))); } - RCODE FLMAPI getUnicode( + RCODE XFLAPI getUnicode( FLMUINT uiElementNumber, FLMUNICODE ** ppuzUnicode); - FINLINE RCODE FLMAPI getUnicode( + FINLINE RCODE XFLAPI getUnicode( FLMUINT uiElementNumber, F_DynaBuf * pBuffer) { @@ -1095,7 +1095,7 @@ public: : RC_SET( NE_XFLM_NOT_FOUND))); } - FINLINE RCODE FLMAPI getUnicode( + FINLINE RCODE XFLAPI getUnicode( FLMUINT uiElementNumber, FLMUNICODE * puzUnicode, FLMUINT * puiBufLen) @@ -1111,7 +1111,7 @@ public: : RC_SET( NE_XFLM_NOT_FOUND))); } - FINLINE RCODE FLMAPI getUTF8( + FINLINE RCODE XFLAPI getUTF8( FLMUINT uiElementNumber, FLMBYTE * pszUTF8, FLMUINT * puiBufLen) @@ -1127,7 +1127,7 @@ public: : RC_SET( NE_XFLM_NOT_FOUND))); } - FINLINE RCODE FLMAPI getBinary( + FINLINE RCODE XFLAPI getBinary( FLMUINT uiElementNumber, void * pvBuffer, FLMUINT * puiLength) @@ -1152,7 +1152,7 @@ public: return( RC_SET( NE_XFLM_NOT_FOUND)); } - FINLINE RCODE FLMAPI getBinary( + FINLINE RCODE XFLAPI getBinary( FLMUINT uiElementNumber, F_DynaBuf * pBuffer) { @@ -1168,7 +1168,7 @@ public: return( RC_SET( NE_XFLM_NOT_FOUND)); } - RCODE FLMAPI outputKey( + RCODE XFLAPI outputKey( IF_Db * pDb, FLMUINT uiIndexNum, FLMUINT uiMatchFlags, @@ -1176,20 +1176,20 @@ public: FLMUINT uiKeyBufSize, FLMUINT * puiKeyLen); - RCODE FLMAPI outputData( + RCODE XFLAPI outputData( IF_Db * pDb, FLMUINT uiIndexNum, FLMBYTE * pucDataBuf, FLMUINT uiDataBufSize, FLMUINT * puiDataLen); - RCODE FLMAPI inputKey( + RCODE XFLAPI inputKey( IF_Db * pDb, FLMUINT uiIndexNum, const FLMBYTE * pucKey, FLMUINT uiKeyLen); - RCODE FLMAPI inputData( + RCODE XFLAPI inputData( IF_Db * pDb, FLMUINT uiIndexNum, const FLMBYTE * pucData, @@ -1197,9 +1197,9 @@ public: // Miscellaneous methods - void FLMAPI reset( void); + void XFLAPI reset( void); - FINLINE const void * FLMAPI getDataPtr( + FINLINE const void * XFLAPI getDataPtr( FLMUINT uiElementNumber) { return( getDataPtr( getVector( uiElementNumber, VECT_SLOT_HAS_DATA))); @@ -1398,24 +1398,24 @@ public: F_Backup(); virtual ~F_Backup(); - FINLINE FLMUINT64 FLMAPI getBackupTransId( void) + FINLINE FLMUINT64 XFLAPI getBackupTransId( void) { return( m_ui64TransId); } - FINLINE FLMUINT64 FLMAPI getLastBackupTransId( void) + FINLINE FLMUINT64 XFLAPI getLastBackupTransId( void) { return( m_ui64LastBackupTransId); } - RCODE FLMAPI backup( + RCODE XFLAPI backup( const char * pszBackupPath, const char * pszPassword, IF_BackupClient * pClient, IF_BackupStatus * pStatus, FLMUINT * puiIncSeqNum); - RCODE FLMAPI endBackup( void); + RCODE XFLAPI endBackup( void); private: @@ -1456,21 +1456,21 @@ public: virtual ~F_DefaultBackupClient(); - RCODE FLMAPI WriteData( + RCODE XFLAPI WriteData( const void * pvBuffer, FLMUINT uiBytesToWrite); - virtual FLMINT FLMAPI getRefCount( void) + virtual FLMINT XFLAPI getRefCount( void) { return( IF_BackupClient::getRefCount()); } - virtual FLMINT FLMAPI AddRef( void) + virtual FLMINT XFLAPI AddRef( void) { return( IF_BackupClient::AddRef()); } - virtual FLMINT FLMAPI Release( void) + virtual FLMINT XFLAPI Release( void) { return( IF_BackupClient::Release()); } @@ -1499,34 +1499,34 @@ public: const char * pszBackupSetPath, const char * pszRflDir); - RCODE FLMAPI openBackupSet( void); + RCODE XFLAPI openBackupSet( void); - RCODE FLMAPI openIncFile( + RCODE XFLAPI openIncFile( FLMUINT uiFileNum); - RCODE FLMAPI openRflFile( + RCODE XFLAPI openRflFile( FLMUINT uiFileNum); - RCODE FLMAPI read( + RCODE XFLAPI read( FLMUINT uiLength, void * pvBuffer, FLMUINT * puiBytesRead); - RCODE FLMAPI close( void); + RCODE XFLAPI close( void); - RCODE FLMAPI abortFile( void); + RCODE XFLAPI abortFile( void); - virtual FLMINT FLMAPI getRefCount( void) + virtual FLMINT XFLAPI getRefCount( void) { return( IF_RestoreClient::getRefCount()); } - virtual FLMINT FLMAPI AddRef( void) + virtual FLMINT XFLAPI AddRef( void) { return( IF_RestoreClient::AddRef()); } - virtual FLMINT FLMAPI Release( void) + virtual FLMINT XFLAPI Release( void) { return( IF_RestoreClient::Release()); } @@ -1556,7 +1556,7 @@ public: { } - RCODE FLMAPI reportProgress( + RCODE XFLAPI reportProgress( eRestoreAction * peAction, FLMUINT64, // ui64BytesToDo, FLMUINT64) // ui64BytesDone @@ -1565,7 +1565,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportError( + RCODE XFLAPI reportError( eRestoreAction * peAction, RCODE) // rcErr { @@ -1573,7 +1573,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportBeginTrans( + RCODE XFLAPI reportBeginTrans( eRestoreAction * peAction, FLMUINT64) // ui64TransId { @@ -1581,7 +1581,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportCommitTrans( + RCODE XFLAPI reportCommitTrans( eRestoreAction * peAction, FLMUINT64) // ui64TransId { @@ -1589,7 +1589,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportAbortTrans( + RCODE XFLAPI reportAbortTrans( eRestoreAction * peAction, FLMUINT64) // ui64TransId { @@ -1597,7 +1597,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportRemoveData( + RCODE XFLAPI reportRemoveData( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiLfNum, @@ -1608,7 +1608,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportInsertData( + RCODE XFLAPI reportInsertData( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiLfNum, @@ -1619,7 +1619,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportReplaceData( + RCODE XFLAPI reportReplaceData( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiLfNum, @@ -1630,7 +1630,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportLFileCreate( + RCODE XFLAPI reportLFileCreate( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT) // uiLfNum @@ -1639,7 +1639,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportLFileUpdate( + RCODE XFLAPI reportLFileUpdate( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiLfNum, @@ -1653,7 +1653,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportUpdateDict( + RCODE XFLAPI reportUpdateDict( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiDictType, @@ -1664,7 +1664,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportIndexSuspend( + RCODE XFLAPI reportIndexSuspend( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT) // uiIndexNum @@ -1673,7 +1673,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportIndexResume( + RCODE XFLAPI reportIndexResume( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT) // uiIndexNum @@ -1682,7 +1682,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportReduce( + RCODE XFLAPI reportReduce( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT) // uiCount @@ -1691,7 +1691,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportUpgrade( + RCODE XFLAPI reportUpgrade( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiOldDbVersion, @@ -1701,7 +1701,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportEnableEncryption( + RCODE XFLAPI reportEnableEncryption( eRestoreAction * peAction, FLMUINT64 // ui64TransId ) @@ -1710,7 +1710,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportWrapKey( + RCODE XFLAPI reportWrapKey( eRestoreAction * peAction, FLMUINT64) // ui64TransId { @@ -1718,7 +1718,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportOpenRflFile( + RCODE XFLAPI reportOpenRflFile( eRestoreAction * peAction, FLMUINT) // uiFileNum { @@ -1726,7 +1726,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportRflRead( + RCODE XFLAPI reportRflRead( eRestoreAction * peAction, FLMUINT, // uiFileNum, FLMUINT) // uiBytesRead @@ -1735,17 +1735,17 @@ public: return( NE_XFLM_OK); } - virtual FLMINT FLMAPI getRefCount( void) + virtual FLMINT XFLAPI getRefCount( void) { return( IF_RestoreStatus::getRefCount()); } - virtual FLMINT FLMAPI AddRef( void) + virtual FLMINT XFLAPI AddRef( void) { return( IF_RestoreStatus::AddRef()); } - virtual FLMINT FLMAPI Release( void) + virtual FLMINT XFLAPI Release( void) { return( IF_RestoreStatus::Release()); } @@ -1854,40 +1854,40 @@ public: virtual ~F_Db(); - RCODE FLMAPI transBegin( + RCODE XFLAPI transBegin( eDbTransType eTransType, FLMUINT uiMaxLockWait = FLM_NO_TIMEOUT, FLMUINT uiFlags = 0, XFLM_DB_HDR * pDbHeader = NULL); - RCODE FLMAPI transBegin( + RCODE XFLAPI transBegin( IF_Db * pDb); - RCODE FLMAPI transCommit( + RCODE XFLAPI transCommit( FLMBOOL * pbEmpty = NULL); - RCODE FLMAPI transAbort( void); + RCODE XFLAPI transAbort( void); - FINLINE eDbTransType FLMAPI getTransType( void) + FINLINE eDbTransType XFLAPI getTransType( void) { return( m_eTransType); } - RCODE FLMAPI doCheckpoint( + RCODE XFLAPI doCheckpoint( FLMUINT uiTimeout); - RCODE FLMAPI dbLock( + RCODE XFLAPI dbLock( eLockType lockType, FLMINT iPriority, FLMUINT uiTimeout); - RCODE FLMAPI dbUnlock( void); + RCODE XFLAPI dbUnlock( void); - RCODE FLMAPI getLockType( + RCODE XFLAPI getLockType( eLockType * pLockType, FLMBOOL * pbImplicit); - RCODE FLMAPI getLockInfo( + RCODE XFLAPI getLockInfo( FLMINT iPriority, eLockType * pCurrLockType, FLMUINT * puiThreadId, @@ -1908,79 +1908,79 @@ public: // Index methods - RCODE FLMAPI indexStatus( + RCODE XFLAPI indexStatus( FLMUINT uiIndexNum, XFLM_INDEX_STATUS * pIndexStatus); - RCODE FLMAPI indexGetNext( + RCODE XFLAPI indexGetNext( FLMUINT * puiIndexNum); - RCODE FLMAPI indexSuspend( + RCODE XFLAPI indexSuspend( FLMUINT uiIndexNum); - RCODE FLMAPI indexResume( + RCODE XFLAPI indexResume( FLMUINT uiIndexNum); // Retrieval Functions - RCODE FLMAPI keyRetrieve( + RCODE XFLAPI keyRetrieve( FLMUINT uiIndex, IF_DataVector * ifpSearchKey, FLMUINT uiFlags, IF_DataVector * ifpFoundKey); - RCODE FLMAPI enableEncryption( void); + RCODE XFLAPI enableEncryption( void); - RCODE FLMAPI wrapKey( + RCODE XFLAPI wrapKey( const char * pszPassword = NULL); - RCODE FLMAPI rollOverDbKey( void); + RCODE XFLAPI rollOverDbKey( void); - RCODE FLMAPI changeItemState( + RCODE XFLAPI changeItemState( FLMUINT uiDictType, FLMUINT uiDictNum, const char * pszState); - RCODE FLMAPI reduceSize( + RCODE XFLAPI reduceSize( FLMUINT uiCount, FLMUINT * puiCountRV); - RCODE FLMAPI upgrade( + RCODE XFLAPI upgrade( IF_UpgradeClient * pUpgradeClient); - RCODE FLMAPI createRootElement( + RCODE XFLAPI createRootElement( FLMUINT uiCollection, FLMUINT uiNameId, IF_DOMNode ** ppElementNode, FLMUINT64 * pui64NodeId = NULL); - RCODE FLMAPI createDocument( + RCODE XFLAPI createDocument( FLMUINT uiCollection, IF_DOMNode ** ppDocumentNode, FLMUINT64 * pui64NodeId = NULL); - RCODE FLMAPI getFirstDocument( + RCODE XFLAPI getFirstDocument( FLMUINT uiCollection, IF_DOMNode ** ppDocumentNode); - RCODE FLMAPI getLastDocument( + RCODE XFLAPI getLastDocument( FLMUINT uiCollection, IF_DOMNode ** ppDocumentNode); - RCODE FLMAPI getDocument( + RCODE XFLAPI getDocument( FLMUINT uiCollection, FLMUINT uiFlags, FLMUINT64 ui64DocumentId, IF_DOMNode ** ppDocumentNode); - RCODE FLMAPI documentDone( + RCODE XFLAPI documentDone( FLMUINT uiCollection, FLMUINT64 ui64RootId); - RCODE FLMAPI documentDone( + RCODE XFLAPI documentDone( IF_DOMNode * pDocNode); - FINLINE RCODE FLMAPI createElementDef( + FINLINE RCODE XFLAPI createElementDef( const char * pszNamespaceURI, const char * pszElementName, FLMUINT uiDataType, @@ -1992,7 +1992,7 @@ public: puiElementNameId, (F_DOMNode **)ppDocumentNode)); } - FINLINE RCODE FLMAPI createElementDef( + FINLINE RCODE XFLAPI createElementDef( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzElementName, FLMUINT uiDataType, @@ -2004,7 +2004,7 @@ public: puiElementNameId, (F_DOMNode **)ppDocumentNode)); } - FINLINE RCODE FLMAPI createUniqueElmDef( + FINLINE RCODE XFLAPI createUniqueElmDef( const char * pszNamespaceURI, const char * pszElementName, FLMUINT * puiElementNameId = NULL, @@ -2015,7 +2015,7 @@ public: puiElementNameId, (F_DOMNode **)ppDocumentNode)); } - FINLINE RCODE FLMAPI createUniqueElmDef( + FINLINE RCODE XFLAPI createUniqueElmDef( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzElementName, FLMUINT * puiElementNameId = NULL, @@ -2026,17 +2026,17 @@ public: puiElementNameId, (F_DOMNode **)ppDocumentNode)); } - RCODE FLMAPI getElementNameId( + RCODE XFLAPI getElementNameId( const char * pszNamespaceURI, const char * pszElementName, FLMUINT * puiElementNameId); - RCODE FLMAPI getElementNameId( + RCODE XFLAPI getElementNameId( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzElementName, FLMUINT * puiElementNameId); - FINLINE RCODE FLMAPI createAttributeDef( + FINLINE RCODE XFLAPI createAttributeDef( const char * pszNamespaceURI, const char * pszAttributeName, FLMUINT uiDataType, @@ -2048,7 +2048,7 @@ public: (F_DOMNode **)ppDocumentNode)); } - FINLINE RCODE FLMAPI createAttributeDef( + FINLINE RCODE XFLAPI createAttributeDef( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzAttributeName, FLMUINT uiDataType, @@ -2060,39 +2060,39 @@ public: (F_DOMNode **)ppDocumentNode)); } - RCODE FLMAPI getAttributeNameId( + RCODE XFLAPI getAttributeNameId( const char * pszNamespaceURI, const char * pszAttributeName, FLMUINT * puiAttributeNameId); - RCODE FLMAPI getAttributeNameId( + RCODE XFLAPI getAttributeNameId( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzAttributeName, FLMUINT * puiAttributeNameId); - FINLINE RCODE FLMAPI createPrefixDef( + FINLINE RCODE XFLAPI createPrefixDef( const char * pszPrefixName, FLMUINT * puiPrefixNumber) { return( createPrefixDef( FALSE, pszPrefixName, puiPrefixNumber)); } - FINLINE RCODE FLMAPI createPrefixDef( + FINLINE RCODE XFLAPI createPrefixDef( const FLMUNICODE * puzPrefixName, FLMUINT * puiPrefixNumber) { return( createPrefixDef( TRUE, puzPrefixName, puiPrefixNumber)); } - RCODE FLMAPI getPrefixId( + RCODE XFLAPI getPrefixId( const char * pszPrefixName, FLMUINT * puiPrefixNumber); - RCODE FLMAPI getPrefixId( + RCODE XFLAPI getPrefixId( const FLMUNICODE * puzPrefixName, FLMUINT * puiPrefixNumber); - FINLINE RCODE FLMAPI createEncDef( + FINLINE RCODE XFLAPI createEncDef( const char * pszEncType, const char * pszEncName, FLMUINT uiKeySize = 0, @@ -2102,7 +2102,7 @@ public: uiKeySize, puiEncDefNumber)); } - FINLINE RCODE FLMAPI createEncDef( + FINLINE RCODE XFLAPI createEncDef( const FLMUNICODE * puzEncType, const FLMUNICODE * puzEncName, FLMUINT uiKeySize = 0, @@ -2112,15 +2112,15 @@ public: uiKeySize, puiEncDefNumber)); } - RCODE FLMAPI getEncDefId( + RCODE XFLAPI getEncDefId( const char * pszEncDefName, FLMUINT * puiEncDefNumber); - RCODE FLMAPI getEncDefId( + RCODE XFLAPI getEncDefId( const FLMUNICODE * puzEncDefName, FLMUINT * puiEncDefNumber); - FINLINE RCODE FLMAPI createCollectionDef( + FINLINE RCODE XFLAPI createCollectionDef( const char * pszCollectionName, FLMUINT * puiCollectionNumber, FLMUINT uiEncNumber = 0) @@ -2129,7 +2129,7 @@ public: puiCollectionNumber, uiEncNumber)); } - FINLINE RCODE FLMAPI createCollectionDef( + FINLINE RCODE XFLAPI createCollectionDef( const FLMUNICODE * puzCollectionName, FLMUINT * puiCollectionNumber, FLMUINT uiEncNumber = 0) @@ -2138,28 +2138,28 @@ public: puiCollectionNumber, uiEncNumber)); } - RCODE FLMAPI getCollectionNumber( + RCODE XFLAPI getCollectionNumber( const char * pszCollectionName, FLMUINT * puiCollectionNumber); - RCODE FLMAPI getCollectionNumber( + RCODE XFLAPI getCollectionNumber( const FLMUNICODE * puzCollectionName, FLMUINT * puiCollectionNumber); - RCODE FLMAPI getIndexNumber( + RCODE XFLAPI getIndexNumber( const char * pszIndexName, FLMUINT * puiIndexNumber); - RCODE FLMAPI getIndexNumber( + RCODE XFLAPI getIndexNumber( const FLMUNICODE * puzIndexName, FLMUINT * puiIndexNumber); - RCODE FLMAPI getDictionaryDef( + RCODE XFLAPI getDictionaryDef( FLMUINT uiDictType, FLMUINT uiDictNumber, IF_DOMNode ** ppDocumentNode); - RCODE FLMAPI getDictionaryName( + RCODE XFLAPI getDictionaryName( FLMUINT uiDictType, FLMUINT uiDictNumber, char * pszName, @@ -2167,7 +2167,7 @@ public: char * pszNamespace = NULL, FLMUINT * puiNamespaceBufSize = NULL); - RCODE FLMAPI getDictionaryName( + RCODE XFLAPI getDictionaryName( FLMUINT uiDictType, FLMUINT uiDictNumber, FLMUNICODE * puzName, @@ -2175,7 +2175,7 @@ public: FLMUNICODE * puzNamespace = NULL, FLMUINT * puiNamespaceBufSize = NULL); - RCODE FLMAPI getNode( + RCODE XFLAPI getNode( FLMUINT uiCollection, FLMUINT64 ui64NodeId, IF_DOMNode ** ifppNode) @@ -2200,121 +2200,121 @@ public: return( getNode( uiCollection, ui64NodeId, XFLM_EXCL, ppNode)); } - RCODE FLMAPI getAttribute( + RCODE XFLAPI getAttribute( FLMUINT uiCollection, FLMUINT64 ui64ElementId, FLMUINT uiAttrName, IF_DOMNode ** ppNode); - RCODE FLMAPI getDataType( + RCODE XFLAPI getDataType( FLMUINT uiDictType, FLMUINT uiNameId, FLMUINT * puiDataType); - RCODE FLMAPI backupBegin( + RCODE XFLAPI backupBegin( eDbBackupType eBackupType, eDbTransType eTransType, FLMUINT uiMaxLockWait, IF_Backup ** ppBackup); - void FLMAPI getRflFileName( + void XFLAPI getRflFileName( FLMUINT uiFileNum, FLMBOOL bBaseOnly, char * pszFileName, FLMUINT * puiFileNameBufSize, FLMBOOL * pbNameTruncated = NULL); - RCODE FLMAPI import( + RCODE XFLAPI import( IF_IStream * pIStream, FLMUINT uiCollection, IF_DOMNode * pNodeToLinkTo = NULL, eNodeInsertLoc eInsertLoc = XFLM_LAST_CHILD, XFLM_IMPORT_STATS * pImportStats = NULL); - RCODE FLMAPI importDocument( + RCODE XFLAPI importDocument( IF_IStream * ifpStream, FLMUINT uiCollection, IF_DOMNode ** ppDocumentNode = NULL, XFLM_IMPORT_STATS * pImportStats = NULL); - RCODE FLMAPI exportXML( + RCODE XFLAPI exportXML( IF_DOMNode * pStartNode, IF_OStream * pOStream, eExportFormatType eFormat = XFLM_EXPORT_INDENT); - RCODE FLMAPI setNextNodeId( + RCODE XFLAPI setNextNodeId( FLMUINT uiCollection, FLMUINT64 ui64NextNodeId); - RCODE FLMAPI setNextDictNum( + RCODE XFLAPI setNextDictNum( FLMUINT uiDictType, FLMUINT uiDictNumber); // Configuration methods - RCODE FLMAPI setRflKeepFilesFlag( + RCODE XFLAPI setRflKeepFilesFlag( FLMBOOL bKeep); - RCODE FLMAPI getRflKeepFlag( + RCODE XFLAPI getRflKeepFlag( FLMBOOL * pbKeep); - RCODE FLMAPI setRflDir( + RCODE XFLAPI setRflDir( const char * pszNewRflDir); - void FLMAPI getRflDir( + void XFLAPI getRflDir( char * pszRflDir); - RCODE FLMAPI getRflFileNum( + RCODE XFLAPI getRflFileNum( FLMUINT * puiRflFileNum); - RCODE FLMAPI getHighestNotUsedRflFileNum( + RCODE XFLAPI getHighestNotUsedRflFileNum( FLMUINT * puiHighestNotUsedRflFileNum); - RCODE FLMAPI setRflFileSizeLimits( + RCODE XFLAPI setRflFileSizeLimits( FLMUINT uiMinRflSize, FLMUINT uiMaxRflSize); - RCODE FLMAPI getRflFileSizeLimits( + RCODE XFLAPI getRflFileSizeLimits( FLMUINT * puiRflMinFileSize, FLMUINT * puiRflMaxFileSize); - RCODE FLMAPI rflRollToNextFile( void); + RCODE XFLAPI rflRollToNextFile( void); - RCODE FLMAPI setKeepAbortedTransInRflFlag( + RCODE XFLAPI setKeepAbortedTransInRflFlag( FLMBOOL bKeep); - RCODE FLMAPI getKeepAbortedTransInRflFlag( + RCODE XFLAPI getKeepAbortedTransInRflFlag( FLMBOOL * pbKeep); - RCODE FLMAPI setAutoTurnOffKeepRflFlag( + RCODE XFLAPI setAutoTurnOffKeepRflFlag( FLMBOOL bAutoTurnOff); - RCODE FLMAPI getAutoTurnOffKeepRflFlag( + RCODE XFLAPI getAutoTurnOffKeepRflFlag( FLMBOOL * pbAutoTurnOff); - FINLINE void FLMAPI setFileExtendSize( + FINLINE void XFLAPI setFileExtendSize( FLMUINT uiFileExtendSize) { m_pDatabase->m_uiFileExtendSize = uiFileExtendSize; } - FINLINE FLMUINT FLMAPI getFileExtendSize( void) + FINLINE FLMUINT XFLAPI getFileExtendSize( void) { return( m_pDatabase->m_uiFileExtendSize); } - FINLINE void FLMAPI setAppData( + FINLINE void XFLAPI setAppData( void * pvAppData) { m_pvAppData = pvAppData; } - FINLINE void * FLMAPI getAppData( void) + FINLINE void * XFLAPI getAppData( void) { return( m_pvAppData); } - FINLINE void FLMAPI setDeleteStatusObject( + FINLINE void XFLAPI setDeleteStatusObject( IF_DeleteStatus * pDeleteStatus) { if (m_pDeleteStatus) @@ -2327,7 +2327,7 @@ public: } } - FINLINE void FLMAPI setCommitClientObject( + FINLINE void XFLAPI setCommitClientObject( IF_CommitClient * pCommitClient) { if (m_pCommitClient) @@ -2343,7 +2343,7 @@ public: } } - FINLINE void FLMAPI setIndexingClientObject( + FINLINE void XFLAPI setIndexingClientObject( IF_IxClient * pIxClient) { if (m_pIxClient) @@ -2357,7 +2357,7 @@ public: } } - FINLINE void FLMAPI setIndexingStatusObject( + FINLINE void XFLAPI setIndexingStatusObject( IF_IxStatus * ifpIxStatus) { if (m_pIxStatus) @@ -2373,22 +2373,22 @@ public: // Configuration information getting methods - FINLINE FLMUINT FLMAPI getDbVersion( void) + FINLINE FLMUINT XFLAPI getDbVersion( void) { return( (FLMUINT)m_pDatabase->m_lastCommittedDbHdr.ui32DbVersion); } - FINLINE FLMUINT FLMAPI getBlockSize( void) + FINLINE FLMUINT XFLAPI getBlockSize( void) { return( m_pDatabase->m_uiBlockSize); } - FINLINE FLMUINT FLMAPI getDefaultLanguage( void) + FINLINE FLMUINT XFLAPI getDefaultLanguage( void) { return( m_pDatabase->m_uiDefaultLanguage); } - FINLINE FLMUINT64 FLMAPI getTransID( void) + FINLINE FLMUINT64 XFLAPI getTransID( void) { if (m_eTransType != XFLM_NO_TRANS) { @@ -2402,10 +2402,10 @@ public: return( 0); } - void FLMAPI getCheckpointInfo( + void XFLAPI getCheckpointInfo( XFLM_CHECKPOINT_INFO * pCheckpointInfo); - RCODE FLMAPI getDbControlFileName( + RCODE XFLAPI getDbControlFileName( char * pszControlFileName, FLMUINT uiControlFileBufSize) { @@ -2427,32 +2427,32 @@ public: return( m_pDatabase->m_pDatabaseLockObj->getWaiterCount() ? TRUE : FALSE); } - RCODE FLMAPI getLockWaiters( + RCODE XFLAPI getLockWaiters( IF_LockInfoClient * pLockInfo); - RCODE FLMAPI getLastBackupTransID( + RCODE XFLAPI getLastBackupTransID( FLMUINT64 * pui64LastBackupTransID); - RCODE FLMAPI getBlocksChangedSinceBackup( + RCODE XFLAPI getBlocksChangedSinceBackup( FLMUINT * puiBlocksChangedSinceBackup); - RCODE FLMAPI getNextIncBackupSequenceNum( + RCODE XFLAPI getNextIncBackupSequenceNum( FLMUINT * puiNextIncBackupSequenceNum); - void FLMAPI getSerialNumber( + void XFLAPI getSerialNumber( char * pucSerialNumber); - RCODE FLMAPI getDiskSpaceUsage( + RCODE XFLAPI getDiskSpaceUsage( FLMUINT64 * pui64DataSize, FLMUINT64 * pui64RollbackSize, FLMUINT64 * pui64RflSize); - FINLINE RCODE FLMAPI getMustCloseRC( void) + FINLINE RCODE XFLAPI getMustCloseRC( void) { return( m_pDatabase->m_rcMustClose); } - FINLINE RCODE FLMAPI getAbortRC( void) + FINLINE RCODE XFLAPI getAbortRC( void) { return( m_AbortRc); } @@ -2498,7 +2498,7 @@ public: return( startTransaction( eReqTransType, pbStartedTrans)); } - FINLINE void FLMAPI setMustAbortTrans( + FINLINE void XFLAPI setMustAbortTrans( RCODE rc) { if( RC_BAD( rc) && RC_OK( m_AbortRc)) @@ -3438,24 +3438,24 @@ public: { } - FINLINE void FLMAPI clearNodeInfo( void) + FINLINE void XFLAPI clearNodeInfo( void) { f_memset( &m_nodeInfo, 0, sizeof( m_nodeInfo)); m_ui64TotalNodes = 0; } - RCODE FLMAPI addNodeInfo( + RCODE XFLAPI addNodeInfo( IF_Db * pDb, IF_DOMNode * pNode, FLMBOOL bDoSubTree, FLMBOOL bDoSelf = TRUE); - FINLINE FLMUINT64 FLMAPI getTotalNodeCount( void) + FINLINE FLMUINT64 XFLAPI getTotalNodeCount( void) { return( m_ui64TotalNodes); } - FINLINE void FLMAPI getNodeInfo( + FINLINE void XFLAPI getNodeInfo( XFLM_NODE_INFO * pNodeInfo) { f_memcpy( pNodeInfo, &m_nodeInfo, sizeof( m_nodeInfo)); @@ -3505,33 +3505,33 @@ public: m_pool.poolFree(); } - FINLINE void FLMAPI clearBTreeInfo( void) + FINLINE void XFLAPI clearBTreeInfo( void) { m_uiNumIndexes = 0; m_uiNumCollections = 0; } - RCODE FLMAPI collectIndexInfo( + RCODE XFLAPI collectIndexInfo( IF_Db * pDb, FLMUINT uiIndexNum, IF_BTreeInfoStatus * pInfoStatus); - RCODE FLMAPI collectCollectionInfo( + RCODE XFLAPI collectCollectionInfo( IF_Db * pDb, FLMUINT uiCollectionNum, IF_BTreeInfoStatus * pInfoStatus); - FINLINE FLMUINT FLMAPI getNumIndexes( void) + FINLINE FLMUINT XFLAPI getNumIndexes( void) { return( m_uiNumIndexes); } - FINLINE FLMUINT FLMAPI getNumCollections( void) + FINLINE FLMUINT XFLAPI getNumCollections( void) { return( m_uiNumCollections); } - FINLINE FLMBOOL FLMAPI getIndexInfo( + FINLINE FLMBOOL XFLAPI getIndexInfo( FLMUINT uiNthIndex, FLMUINT * puiIndexNum, char ** ppszIndexName, @@ -3553,7 +3553,7 @@ public: } } - FINLINE FLMBOOL FLMAPI getCollectionInfo( + FINLINE FLMBOOL XFLAPI getCollectionInfo( FLMUINT uiNthCollection, FLMUINT * puiCollectionNum, char ** ppszCollectionName, @@ -3575,7 +3575,7 @@ public: } } - FINLINE FLMBOOL FLMAPI getIndexLevelInfo( + FINLINE FLMBOOL XFLAPI getIndexLevelInfo( FLMUINT uiNthIndex, FLMUINT uiBTreeLevel, XFLM_BTREE_LEVEL_INFO * pLevelInfo) @@ -3594,7 +3594,7 @@ public: } } - FINLINE FLMBOOL FLMAPI getCollectionLevelInfo( + FINLINE FLMBOOL XFLAPI getCollectionLevelInfo( FLMUINT uiNthCollection, FLMUINT uiBTreeLevel, XFLM_BTREE_LEVEL_INFO * pLevelInfo) @@ -3707,7 +3707,7 @@ public: } } - FINLINE RCODE FLMAPI compare( + FINLINE RCODE XFLAPI compare( const void * pvKey1, FLMUINT uiKeyLen1, const void * pvKey2, @@ -3756,17 +3756,17 @@ public: m_bCompareDocId = bCompareDocId; } - virtual FLMINT FLMAPI getRefCount( void) + virtual FLMINT XFLAPI getRefCount( void) { return( IF_ResultSetCompare::getRefCount()); } - virtual FLMINT FLMAPI AddRef( void) + virtual FLMINT XFLAPI AddRef( void) { return( IF_ResultSetCompare::AddRef()); } - virtual FLMINT FLMAPI Release( void) + virtual FLMINT XFLAPI Release( void) { return( IF_ResultSetCompare::Release()); } @@ -3936,7 +3936,7 @@ public: // Methods for constructing a query - FINLINE RCODE FLMAPI setLanguage( + FINLINE RCODE XFLAPI setLanguage( FLMUINT uiLanguage) { @@ -3950,7 +3950,7 @@ public: return( NE_XFLM_OK); } - FINLINE RCODE FLMAPI setCollection( + FINLINE RCODE XFLAPI setCollection( FLMUINT uiCollection ) { @@ -3965,68 +3965,68 @@ public: return( NE_XFLM_OK); } - FINLINE RCODE FLMAPI setupQueryExpr( + FINLINE RCODE XFLAPI setupQueryExpr( IF_Db * pDb, const FLMUNICODE * puzQuery) { return( setupQueryExpr( TRUE, pDb, (void *)puzQuery)); } - FINLINE RCODE FLMAPI setupQueryExpr( + FINLINE RCODE XFLAPI setupQueryExpr( IF_Db * pDb, const char * pszQuery) { return( setupQueryExpr( FALSE, pDb, (void *)pszQuery)); } - RCODE FLMAPI copyCriteria( + RCODE XFLAPI copyCriteria( IF_Query * pSrcQuery); - RCODE FLMAPI addXPathComponent( + RCODE XFLAPI addXPathComponent( eXPathAxisTypes eXPathAxis, eDomNodeType eNodeType, FLMUINT uiNameId, IF_QueryNodeSource * pNodeSource); - RCODE FLMAPI addOperator( + RCODE XFLAPI addOperator( eQueryOperators eOperator, FLMUINT uiCompareRules = 0, IF_OperandComparer * pOpComparer = NULL); - RCODE FLMAPI addUnicodeValue( + RCODE XFLAPI addUnicodeValue( const FLMUNICODE * puzVal); - RCODE FLMAPI addUTF8Value( + RCODE XFLAPI addUTF8Value( const char * pszVal, FLMUINT uiUTF8Len = 0); - RCODE FLMAPI addBinaryValue( + RCODE XFLAPI addBinaryValue( const void * pvVal, FLMUINT uiValLen); - RCODE FLMAPI addUINTValue( + RCODE XFLAPI addUINTValue( FLMUINT uiVal); - RCODE FLMAPI addINTValue( + RCODE XFLAPI addINTValue( FLMINT iVal); - RCODE FLMAPI addUINT64Value( + RCODE XFLAPI addUINT64Value( FLMUINT64 ui64Val); - RCODE FLMAPI addINT64Value( + RCODE XFLAPI addINT64Value( FLMINT64 i64Val); - RCODE FLMAPI addBoolean( + RCODE XFLAPI addBoolean( FLMBOOL bVal, FLMBOOL bUnknown = FALSE); - FINLINE RCODE FLMAPI addFunction( + FINLINE RCODE XFLAPI addFunction( eQueryFunctions eFunction) { return( addFunction( eFunction, NULL, FALSE)); } - FINLINE RCODE FLMAPI addFunction( + FINLINE RCODE XFLAPI addFunction( IF_QueryValFunc * pFuncObj, FLMBOOL bHasXPathExpr) { @@ -4037,55 +4037,55 @@ public: return( addFunction( XFLM_FUNC_xxx, pFuncObj, bHasXPathExpr)); } - RCODE FLMAPI getFirst( + RCODE XFLAPI getFirst( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit = 0); - RCODE FLMAPI getLast( + RCODE XFLAPI getLast( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit = 0); - RCODE FLMAPI getNext( + RCODE XFLAPI getNext( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit = 0, FLMUINT uiNumToSkip = 0, FLMUINT * puiNumSkipped = NULL); - RCODE FLMAPI getPrev( + RCODE XFLAPI getPrev( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit = 0, FLMUINT uiNumToSkip = 0, FLMUINT * puiNumSkipped = NULL); - RCODE FLMAPI getCurrent( + RCODE XFLAPI getCurrent( IF_Db * pDb, IF_DOMNode ** ppNode); - void FLMAPI resetQuery( void); + void XFLAPI resetQuery( void); - RCODE FLMAPI getStatsAndOptInfo( + RCODE XFLAPI getStatsAndOptInfo( FLMUINT * puiNumOptInfos, XFLM_OPT_INFO ** ppOptInfo); - void FLMAPI freeStatsAndOptInfo( + void XFLAPI freeStatsAndOptInfo( XFLM_OPT_INFO ** ppOptInfo); - void FLMAPI setDupHandling( + void XFLAPI setDupHandling( FLMBOOL bRemoveDups); - RCODE FLMAPI setIndex( + RCODE XFLAPI setIndex( FLMUINT uiIndex); - RCODE FLMAPI getIndex( + RCODE XFLAPI getIndex( IF_Db * pDb, FLMUINT * puiIndex, FLMBOOL * pbHaveMultiple); - RCODE FLMAPI addSortKey( + RCODE XFLAPI addSortKey( void * pvSortKeyContext, FLMBOOL bChildToContext, FLMBOOL bElement, @@ -4097,7 +4097,7 @@ public: FLMBOOL bSortMissingHigh, void ** ppvContext); - FINLINE RCODE FLMAPI enablePositioning( void) + FINLINE RCODE XFLAPI enablePositioning( void) { if (m_bOptimized) { @@ -4110,30 +4110,30 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI positionTo( + RCODE XFLAPI positionTo( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit, FLMUINT uiPosition); - RCODE FLMAPI positionTo( + RCODE XFLAPI positionTo( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit, IF_DataVector * pSearchKey, FLMUINT uiFlags); - RCODE FLMAPI getPosition( + RCODE XFLAPI getPosition( IF_Db * pDb, FLMUINT * puiPosition); - RCODE FLMAPI buildResultSet( + RCODE XFLAPI buildResultSet( IF_Db * pDb, FLMUINT uiTimeLimit); - void FLMAPI stopBuildingResultSet( void); + void XFLAPI stopBuildingResultSet( void); - RCODE FLMAPI getCounts( + RCODE XFLAPI getCounts( IF_Db * pDb, FLMUINT uiTimeLimit, FLMBOOL bPartialCountOk, @@ -4142,12 +4142,12 @@ public: FLMUINT * puiPositionableToCount, FLMBOOL * pbDoneBuildingResultSet = NULL); - FINLINE void FLMAPI enableResultSetEncryption( void) + FINLINE void XFLAPI enableResultSetEncryption( void) { m_bEncryptResultSet = TRUE; } - FINLINE void FLMAPI setQueryStatusObject( + FINLINE void XFLAPI setQueryStatusObject( IF_QueryStatus * pQueryStatus) { if (m_pQueryStatus) @@ -4160,7 +4160,7 @@ public: } } - FINLINE void FLMAPI setQueryValidatorObject( + FINLINE void XFLAPI setQueryValidatorObject( IF_QueryValidator * pQueryValidator) { if (m_pQueryValidator) @@ -4175,7 +4175,7 @@ public: private: - RCODE FLMAPI addFunction( + RCODE XFLAPI addFunction( eQueryFunctions eFunction, IF_QueryValFunc * pFuncObj, FLMBOOL bHasXPathExpr); @@ -4715,31 +4715,31 @@ public: virtual ~F_DbSystem(); - virtual FLMINT FLMAPI AddRef( + virtual FLMINT XFLAPI AddRef( FLMBOOL bSysDataLocked); - virtual FLMINT FLMAPI AddRef( void) + virtual FLMINT XFLAPI AddRef( void) { return( AddRef( FALSE)); } - virtual FLMINT FLMAPI Release( void); + virtual FLMINT XFLAPI Release( void); - virtual FLMINT FLMAPI getRefCount( void) + virtual FLMINT XFLAPI getRefCount( void) { return( (FLMINT)m_refCnt); } - RCODE FLMAPI init( void); + RCODE XFLAPI init( void); - RCODE FLMAPI updateIniFile( + RCODE XFLAPI updateIniFile( const char * pszParamName, const char * pszValue); - void FLMAPI getFileSystem( + void XFLAPI getFileSystem( IF_FileSystem ** ppFileSystem); - RCODE FLMAPI dbCreate( + RCODE XFLAPI dbCreate( const char * pszDbFileName, const char * pszDataDir, const char * pszRflDir, @@ -4749,7 +4749,7 @@ public: FLMBOOL bTempDb, IF_Db ** ppDb); - FINLINE RCODE FLMAPI dbCreate( + FINLINE RCODE XFLAPI dbCreate( const char * pszDbFileName, const char * pszDataDir, const char * pszRflDir, @@ -4762,7 +4762,7 @@ public: pszDictBuf, pCreateOpts, FALSE, ppDb)); } - FINLINE RCODE FLMAPI dbOpen( + FINLINE RCODE XFLAPI dbOpen( const char * pszDbFileName, const char * pszDataDir, const char * pszRflDir, @@ -4776,7 +4776,7 @@ public: pszPassword, uiOpenFlags, ppDb)); } - RCODE FLMAPI dbRebuild( + RCODE XFLAPI dbRebuild( const char * pszSourceDbPath, const char * pszSourceDataDir, const char * pszDestDbPath, @@ -4790,7 +4790,7 @@ public: FLMUINT64 * pui64QuarantinedNodes, IF_DbRebuildStatus * pRebuildStatus); - RCODE FLMAPI dbCheck( + RCODE XFLAPI dbCheck( const char * pszDbFileName, const char * pszDataDir, const char * pszRflDir, @@ -4799,7 +4799,7 @@ public: IF_DbInfo ** ppDbInfo, IF_DbCheckStatus * pDbCheck); - FINLINE RCODE FLMAPI dbDup( + FINLINE RCODE XFLAPI dbDup( IF_Db * ifpDb, IF_Db ** ppDb) { @@ -4809,7 +4809,7 @@ public: FALSE, NULL, NULL, NULL, ppDb)); } - FINLINE RCODE FLMAPI setDynamicMemoryLimit( + FINLINE RCODE XFLAPI setDynamicMemoryLimit( FLMUINT uiCacheAdjustPercent, FLMUINT uiCacheAdjustMin, FLMUINT uiCacheAdjustMax, @@ -4820,7 +4820,7 @@ public: uiCacheAdjustMax, uiCacheAdjustMinToLeave)); } - FINLINE RCODE FLMAPI setHardMemoryLimit( + FINLINE RCODE XFLAPI setHardMemoryLimit( FLMUINT uiPercent, FLMBOOL bPercentOfAvail, FLMUINT uiMin, @@ -4834,7 +4834,7 @@ public: // Determine if dyamic cache adjusting is supported. - FINLINE FLMBOOL FLMAPI getDynamicCacheSupported( void) + FINLINE FLMBOOL XFLAPI getDynamicCacheSupported( void) { #ifdef FLM_CAN_GET_PHYS_MEM return( TRUE); @@ -4843,7 +4843,7 @@ public: #endif } - FINLINE void FLMAPI getCacheInfo( + FINLINE void XFLAPI getCacheInfo( XFLM_CACHE_INFO * pCacheInfo) { gv_XFlmSysData.pGlobalCacheMgr->getCacheInfo( pCacheInfo); @@ -4851,14 +4851,14 @@ public: // Enable/disable cache debugging mode - void FLMAPI enableCacheDebug( + void XFLAPI enableCacheDebug( FLMBOOL bDebug); - FLMBOOL FLMAPI cacheDebugEnabled( void); + FLMBOOL XFLAPI cacheDebugEnabled( void); // Clear cache - FINLINE RCODE FLMAPI clearCache( + FINLINE RCODE XFLAPI clearCache( IF_Db * pDb) { return( gv_XFlmSysData.pGlobalCacheMgr->clearCache( pDb)); @@ -4867,120 +4867,120 @@ public: // Close all files that have not been used for the specified number of // seconds. - RCODE FLMAPI closeUnusedFiles( + RCODE XFLAPI closeUnusedFiles( FLMUINT uiSeconds); // Start gathering statistics. - void FLMAPI startStats( void); + void XFLAPI startStats( void); // Stop gathering statistics. - void FLMAPI stopStats( void); + void XFLAPI stopStats( void); // Reset statistics. - void FLMAPI resetStats( void); + void XFLAPI resetStats( void); - RCODE FLMAPI getStats( + RCODE XFLAPI getStats( XFLM_STATS * pFlmStats); - void FLMAPI freeStats( + void XFLAPI freeStats( XFLM_STATS * pFlmStats); // Set the maximum number of queries to save. - void FLMAPI setQuerySaveMax( + void XFLAPI setQuerySaveMax( FLMUINT uiMaxToSave); - FLMUINT FLMAPI getQuerySaveMax( void); + FLMUINT XFLAPI getQuerySaveMax( void); // Set temporary directory. - RCODE FLMAPI setTempDir( + RCODE XFLAPI setTempDir( const char * pszPath); - RCODE FLMAPI getTempDir( + RCODE XFLAPI getTempDir( char * pszPath); // Maximum seconds between checkpoints. - void FLMAPI setCheckpointInterval( + void XFLAPI setCheckpointInterval( FLMUINT uiSeconds); - FLMUINT FLMAPI getCheckpointInterval( void); + FLMUINT XFLAPI getCheckpointInterval( void); // Set interval for dynamically adjusting cache limit. - void FLMAPI setCacheAdjustInterval( + void XFLAPI setCacheAdjustInterval( FLMUINT uiSeconds); - FLMUINT FLMAPI getCacheAdjustInterval( void); + FLMUINT XFLAPI getCacheAdjustInterval( void); // Set interval for dynamically cleaning out old cache blocks and records. - void FLMAPI setCacheCleanupInterval( + void XFLAPI setCacheCleanupInterval( FLMUINT uiSeconds); - FLMUINT FLMAPI getCacheCleanupInterval( void); + FLMUINT XFLAPI getCacheCleanupInterval( void); // Set interval for cleaning up unused structures. - void FLMAPI setUnusedCleanupInterval( + void XFLAPI setUnusedCleanupInterval( FLMUINT uiSeconds); - FLMUINT FLMAPI getUnusedCleanupInterval( void); + FLMUINT XFLAPI getUnusedCleanupInterval( void); // Set maximum time for an item to be unused. - void FLMAPI setMaxUnusedTime( + void XFLAPI setMaxUnusedTime( FLMUINT uiSeconds); - FLMUINT FLMAPI getMaxUnusedTime( void); + FLMUINT XFLAPI getMaxUnusedTime( void); // Specify the logger object - void FLMAPI setLogger( + void XFLAPI setLogger( IF_LoggerClient * pLogger); // Enable or disable use of ESM - void FLMAPI enableExtendedServerMemory( + void XFLAPI enableExtendedServerMemory( FLMBOOL bEnable); - FLMBOOL FLMAPI extendedServerMemoryEnabled( void); + FLMBOOL XFLAPI extendedServerMemoryEnabled( void); - void FLMAPI deactivateOpenDb( + void XFLAPI deactivateOpenDb( const char * pszDbFileName, const char * pszDataDir); // Maximum dirty cache. - void FLMAPI setDirtyCacheLimits( + void XFLAPI setDirtyCacheLimits( FLMUINT uiMaxDirty, FLMUINT uiLowDirty); - void FLMAPI getDirtyCacheLimits( + void XFLAPI getDirtyCacheLimits( FLMUINT * puiMaxDirty, FLMUINT * puiLowDirty); - RCODE FLMAPI getThreadInfo( + RCODE XFLAPI getThreadInfo( IF_ThreadInfo ** ppThreadInfo); - RCODE FLMAPI registerForEvent( + RCODE XFLAPI registerForEvent( eEventCategory eCategory, IF_EventClient * pEventClient); - void FLMAPI deregisterForEvent( + void XFLAPI deregisterForEvent( eEventCategory eCategory, IF_EventClient * pEventClient); - RCODE FLMAPI getNextMetaphone( + RCODE XFLAPI getNextMetaphone( IF_IStream * pIStream, FLMUINT * puiMetaphone, FLMUINT * puiAltMetaphone = NULL); - RCODE FLMAPI dbCopy( + RCODE XFLAPI dbCopy( const char * pszSrcDbName, const char * pszSrcDataDir, const char * pszSrcRflDir, @@ -4989,13 +4989,13 @@ public: const char * pszDestRflDir, IF_DbCopyStatus * ifpStatus); - RCODE FLMAPI dbRemove( + RCODE XFLAPI dbRemove( const char * pszDbName, const char * pszDataDir, const char * pszRflDir, FLMBOOL bRemoveRflFiles); - RCODE FLMAPI dbRename( + RCODE XFLAPI dbRename( const char * pszDbName, const char * pszDataDir, const char * pszRflDir, @@ -5003,7 +5003,7 @@ public: FLMBOOL bOverwriteDestOk, IF_DbRenameStatus * ifpStatus); - RCODE FLMAPI dbRestore( + RCODE XFLAPI dbRestore( const char * pszDbPath, const char * pszDataDir, const char * pszRflDir, @@ -5012,90 +5012,90 @@ public: IF_RestoreClient * pRestoreObj, IF_RestoreStatus * pRestoreStatus); - RCODE FLMAPI strCmp( + RCODE XFLAPI strCmp( FLMUINT uiCompFlags, FLMUINT uiLanguage, FLMUNICODE * uzStr1, FLMUNICODE * uzStr2, FLMINT * piCmp); - FLMBOOL FLMAPI errorIsFileCorrupt( + FLMBOOL XFLAPI errorIsFileCorrupt( RCODE rc); - const char * FLMAPI checkErrorToStr( + const char * XFLAPI checkErrorToStr( FLMINT iCheckErrorCode); - RCODE FLMAPI openBufferIStream( + RCODE XFLAPI openBufferIStream( const char * pucBuffer, FLMUINT uiLength, IF_PosIStream ** ppIStream); - RCODE FLMAPI openFileIStream( + RCODE XFLAPI openFileIStream( const char * pszPath, IF_PosIStream ** ppIStream); - RCODE FLMAPI openMultiFileIStream( + RCODE XFLAPI openMultiFileIStream( const char * pszDirectory, const char * pszBaseName, IF_IStream ** ppIStream); - RCODE FLMAPI openBufferedIStream( + RCODE XFLAPI openBufferedIStream( IF_IStream * pIStream, FLMUINT uiBufferSize, IF_IStream ** ppIStream); - RCODE FLMAPI openUncompressingIStream( + RCODE XFLAPI openUncompressingIStream( IF_IStream * pIStream, IF_IStream ** ppIStream); - RCODE FLMAPI openFileOStream( + RCODE XFLAPI openFileOStream( const char * pszFileName, FLMBOOL bTruncateIfExists, IF_OStream ** ppOStream); - RCODE FLMAPI openMultiFileOStream( + RCODE XFLAPI openMultiFileOStream( const char * pszDirectory, const char * pszBaseName, FLMUINT uiMaxFileSize, FLMBOOL bOverwrite, IF_OStream ** ppStream); - RCODE FLMAPI removeMultiFileStream( + RCODE XFLAPI removeMultiFileStream( const char * pszDirectory, const char * pszBaseName); - RCODE FLMAPI openBufferedOStream( + RCODE XFLAPI openBufferedOStream( IF_OStream * pOStream, FLMUINT uiBufferSize, IF_OStream ** ppOStream); - RCODE FLMAPI openCompressingOStream( + RCODE XFLAPI openCompressingOStream( IF_OStream * pOStream, IF_OStream ** ppOStream); - RCODE FLMAPI writeToOStream( + RCODE XFLAPI writeToOStream( IF_IStream * pIStream, IF_OStream * pOStream); - RCODE FLMAPI openBase64Encoder( + RCODE XFLAPI openBase64Encoder( IF_IStream * pInputStream, FLMBOOL bInsertLineBreaks, IF_IStream ** ppEncodedStream); - RCODE FLMAPI openBase64Decoder( + RCODE XFLAPI openBase64Decoder( IF_IStream * pInputStream, IF_IStream ** ppDecodedStream); - RCODE FLMAPI createIFDataVector( + RCODE XFLAPI createIFDataVector( IF_DataVector ** ifppDV); - RCODE FLMAPI createIFResultSet( + RCODE XFLAPI createIFResultSet( IF_ResultSet ** ppResultSet); - RCODE FLMAPI createIFQuery( + RCODE XFLAPI createIFQuery( IF_Query ** ppQuery); - FINLINE void FLMAPI freeMem( + FINLINE void XFLAPI freeMem( void ** ppMem) { f_free( ppMem); @@ -5135,7 +5135,7 @@ public: return( FALSE); } - RCODE FLMAPI compareUTF8Strings( + RCODE XFLAPI compareUTF8Strings( const FLMBYTE * pucLString, FLMUINT uiLStrBytes, FLMBOOL bLeftWild, @@ -5146,7 +5146,7 @@ public: FLMUINT uiLanguage, FLMINT * piResult); - RCODE FLMAPI compareUnicodeStrings( + RCODE XFLAPI compareUnicodeStrings( const FLMUNICODE * puzLString, FLMUINT uiLStrBytes, FLMBOOL bLeftWild, @@ -5157,44 +5157,44 @@ public: FLMUINT uiLanguage, FLMINT * piResult); - RCODE FLMAPI utf8IsSubStr( + RCODE XFLAPI utf8IsSubStr( const FLMBYTE * pszString, const FLMBYTE * pszSubString, FLMUINT uiCompareRules, FLMUINT uiLanguage, FLMBOOL * pbExists); - FLMBOOL FLMAPI uniIsUpper( + FLMBOOL XFLAPI uniIsUpper( FLMUNICODE uzChar); - FLMBOOL FLMAPI uniIsLower( + FLMBOOL XFLAPI uniIsLower( FLMUNICODE uzChar); - FLMBOOL FLMAPI uniIsAlpha( + FLMBOOL XFLAPI uniIsAlpha( FLMUNICODE uzChar); - FLMBOOL FLMAPI uniIsDecimalDigit( + FLMBOOL XFLAPI uniIsDecimalDigit( FLMUNICODE uzChar); - FLMUNICODE FLMAPI uniToLower( + FLMUNICODE XFLAPI uniToLower( FLMUNICODE uzChar); - RCODE FLMAPI nextUCS2Char( + RCODE XFLAPI nextUCS2Char( const FLMBYTE ** ppszUTF8, const FLMBYTE * pszEndOfUTF8String, FLMUNICODE * puzChar); - RCODE FLMAPI numUCS2Chars( + RCODE XFLAPI numUCS2Chars( const FLMBYTE * pszUTF8, FLMUINT * puiNumChars); - RCODE FLMAPI waitToClose( + RCODE XFLAPI waitToClose( const char * pszDbPath); - RCODE FLMAPI createIFNodeInfo( + RCODE XFLAPI createIFNodeInfo( IF_NodeInfo ** ifppNodeInfo); - RCODE FLMAPI createIFBTreeInfo( + RCODE XFLAPI createIFBTreeInfo( IF_BTreeInfo ** ifppBTreeInfo); private: @@ -5265,10 +5265,10 @@ private: const char * pszDestRflDir, IF_DbCopyStatus * ifpStatus); - static RCODE FLMAPI monitorThrd( + static RCODE XFLAPI monitorThrd( IF_Thread * pThread); - static RCODE FLMAPI cacheCleanupThrd( + static RCODE XFLAPI cacheCleanupThrd( IF_Thread * pThread); FLMATOMIC m_refCnt; @@ -5403,36 +5403,36 @@ public: FLMUINT32 ui32BlkAddr = 0, FLMUINT uiOffsetIndex = 0); - FINLINE FLMUINT64 FLMAPI totalSize( void) + FINLINE FLMUINT64 XFLAPI totalSize( void) { return( m_uiStreamSize); } - FINLINE FLMUINT64 FLMAPI remainingSize( void) + FINLINE FLMUINT64 XFLAPI remainingSize( void) { return( m_uiStreamSize - (m_uiBufferStartOffset + m_uiBufferOffset)); } - FINLINE RCODE FLMAPI closeStream( void) + FINLINE RCODE XFLAPI closeStream( void) { reset(); return( NE_XFLM_OK); } - RCODE FLMAPI positionTo( + RCODE XFLAPI positionTo( FLMUINT64 ui64Position); - FINLINE FLMUINT64 FLMAPI getCurrPosition( void) + FINLINE FLMUINT64 XFLAPI getCurrPosition( void) { return( m_uiBufferStartOffset + m_uiBufferOffset); } - RCODE FLMAPI read( + RCODE XFLAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FLMINT FLMAPI Release( void); + FLMINT XFLAPI Release( void); FINLINE FLMUINT32 getBlkAddr( void) { @@ -5493,22 +5493,22 @@ public: reset(); } - RCODE FLMAPI openStream( + RCODE XFLAPI openStream( const char * pucBuffer, FLMUINT uiLength, char ** ppucAllocatedBuffer = NULL); - FINLINE FLMUINT64 FLMAPI totalSize( void) + FINLINE FLMUINT64 XFLAPI totalSize( void) { return( m_pBufferIStream->totalSize()); } - FINLINE FLMUINT64 FLMAPI remainingSize( void) + FINLINE FLMUINT64 XFLAPI remainingSize( void) { return( m_pBufferIStream->remainingSize()); } - FINLINE RCODE FLMAPI closeStream( void) + FINLINE RCODE XFLAPI closeStream( void) { RCODE rc = NE_FLM_OK; @@ -5521,18 +5521,18 @@ public: return( rc); } - FINLINE RCODE FLMAPI positionTo( + FINLINE RCODE XFLAPI positionTo( FLMUINT64 ui64Position) { return( m_pBufferIStream->positionTo( ui64Position)); } - FINLINE FLMUINT64 FLMAPI getCurrPosition( void) + FINLINE FLMUINT64 XFLAPI getCurrPosition( void) { return( m_pBufferIStream->getCurrPosition()); } - FINLINE RCODE FLMAPI read( + FINLINE RCODE XFLAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead) @@ -5540,7 +5540,7 @@ public: return( m_pBufferIStream->read( pvBuffer, uiBytesToRead, puiBytesRead)); } - FINLINE void FLMAPI truncate( + FINLINE void XFLAPI truncate( FLMUINT uiOffset) { m_pBufferIStream->truncateStream( uiOffset); @@ -5608,9 +5608,9 @@ public: } } - FLMINT FLMAPI Release( void); + FLMINT XFLAPI Release( void); - RCODE FLMAPI createNode( + RCODE XFLAPI createNode( IF_Db * pDb, eDomNodeType eNodeType, FLMUINT uiNameId, @@ -5618,34 +5618,34 @@ public: IF_DOMNode ** ppNewNode, FLMUINT64 * pui64NodeId = NULL); - RCODE FLMAPI createChildElement( + RCODE XFLAPI createChildElement( IF_Db * pDb, FLMUINT uiChildElementNameId, eNodeInsertLoc eLocation, IF_DOMNode ** ppNewChildElementNode, FLMUINT64 * pui64NodeId = NULL); - RCODE FLMAPI deleteNode( + RCODE XFLAPI deleteNode( IF_Db * pDb); - RCODE FLMAPI deleteChildren( + RCODE XFLAPI deleteChildren( IF_Db * pDb, FLMUINT uiNameId = 0); - RCODE FLMAPI createAttribute( + RCODE XFLAPI createAttribute( IF_Db * pDb, FLMUINT uiAttrNameId, IF_DOMNode ** ppAttrNode); - RCODE FLMAPI getFirstAttribute( + RCODE XFLAPI getFirstAttribute( IF_Db * pDb, IF_DOMNode ** ppAttrNode); - RCODE FLMAPI getLastAttribute( + RCODE XFLAPI getLastAttribute( IF_Db * pDb, IF_DOMNode ** ppAttrNode); - FINLINE RCODE FLMAPI getAttribute( + FINLINE RCODE XFLAPI getAttribute( IF_Db * pDb, FLMUINT uiAttrNameId, IF_DOMNode ** ppAttrNode) @@ -5653,36 +5653,36 @@ public: return( hasAttribute( pDb, uiAttrNameId, ppAttrNode)); } - RCODE FLMAPI deleteAttribute( + RCODE XFLAPI deleteAttribute( IF_Db * pDb, FLMUINT uiAttrNameId); - RCODE FLMAPI hasAttribute( + RCODE XFLAPI hasAttribute( IF_Db * pDb, FLMUINT uiAttrNameId, IF_DOMNode ** ppAttrNode = NULL); - RCODE FLMAPI hasAttributes( + RCODE XFLAPI hasAttributes( IF_Db * pDb, FLMBOOL * pbHasAttrs); - RCODE FLMAPI hasNextSibling( + RCODE XFLAPI hasNextSibling( IF_Db * pDb, FLMBOOL * pbHasNextSibling); - RCODE FLMAPI hasPreviousSibling( + RCODE XFLAPI hasPreviousSibling( IF_Db * pDb, FLMBOOL * pbHasPreviousSibling); - RCODE FLMAPI hasChildren( + RCODE XFLAPI hasChildren( IF_Db * pDb, FLMBOOL * pbHasChildren); - RCODE FLMAPI isNamespaceDecl( + RCODE XFLAPI isNamespaceDecl( IF_Db * pDb, FLMBOOL * pbIsNamespaceDecl); - FINLINE eDomNodeType FLMAPI getNodeType( void) + FINLINE eDomNodeType XFLAPI getNodeType( void) { if( m_uiAttrNameId) { @@ -5697,51 +5697,51 @@ public: return( INVALID_NODE); } - RCODE FLMAPI getNodeId( + RCODE XFLAPI getNodeId( IF_Db * pDb, FLMUINT64 * pui64NodeId); - RCODE FLMAPI getParentId( + RCODE XFLAPI getParentId( IF_Db * pDb, FLMUINT64 * pui64ParentId); - RCODE FLMAPI getDocumentId( + RCODE XFLAPI getDocumentId( IF_Db * pDb, FLMUINT64 * pui64DocumentId); - RCODE FLMAPI getPrevSibId( + RCODE XFLAPI getPrevSibId( IF_Db * pDb, FLMUINT64 * pui64PrevSibId); - RCODE FLMAPI getNextSibId( + RCODE XFLAPI getNextSibId( IF_Db * pDb, FLMUINT64 * pui64NextSibId); - RCODE FLMAPI getFirstChildId( + RCODE XFLAPI getFirstChildId( IF_Db * pDb, FLMUINT64 * pui64FirstChildId); - RCODE FLMAPI getLastChildId( + RCODE XFLAPI getLastChildId( IF_Db * pDb, FLMUINT64 * pui64LastChildId); - RCODE FLMAPI getNameId( + RCODE XFLAPI getNameId( IF_Db * pDb, FLMUINT * puiNameId); - virtual RCODE FLMAPI getEncDefId( + virtual RCODE XFLAPI getEncDefId( IF_Db * pDb, FLMUINT * puiEncDefId); - RCODE FLMAPI getDataType( + RCODE XFLAPI getDataType( IF_Db * pDb, FLMUINT * puiDataType); - RCODE FLMAPI getDataLength( + RCODE XFLAPI getDataLength( IF_Db * pDb, FLMUINT * puiLength); - FINLINE RCODE FLMAPI getUINT32( + FINLINE RCODE XFLAPI getUINT32( IF_Db * pDb, FLMUINT32 * pui32Value) { @@ -5756,7 +5756,7 @@ public: return( convertToUINT32( ui64Value, FALSE, pui32Value)); } - FINLINE RCODE FLMAPI getUINT( + FINLINE RCODE XFLAPI getUINT( IF_Db * pDb, FLMUINT * puiValue) { @@ -5771,14 +5771,14 @@ public: return( convertToUINT( ui64Value, FALSE, puiValue)); } - FINLINE RCODE FLMAPI getUINT64( + FINLINE RCODE XFLAPI getUINT64( IF_Db * pDb, FLMUINT64 * pui64Value) { return( getNumber64( (F_Db *)pDb, pui64Value, NULL)); } - FINLINE RCODE FLMAPI getINT32( + FINLINE RCODE XFLAPI getINT32( IF_Db * pDb, FLMINT32 * pi32Value) { @@ -5794,7 +5794,7 @@ public: return( convertToINT32( ui64Value, bNeg, pi32Value)); } - FINLINE RCODE FLMAPI getINT( + FINLINE RCODE XFLAPI getINT( IF_Db * pDb, FLMINT * piValue) { @@ -5810,7 +5810,7 @@ public: return( convertToINT( ui64Value, bNeg, piValue)); } - FINLINE RCODE FLMAPI getINT64( + FINLINE RCODE XFLAPI getINT64( IF_Db * pDb, FLMINT64 * pi64Value) { @@ -5826,18 +5826,18 @@ public: return( convertToINT64( ui64Value, bNeg, pi64Value)); } - RCODE FLMAPI getMetaValue( + RCODE XFLAPI getMetaValue( IF_Db * pDb, FLMUINT64 * pui64Value); - FINLINE RCODE FLMAPI getUnicodeChars( + FINLINE RCODE XFLAPI getUnicodeChars( IF_Db * pDb, FLMUINT * puiNumChars) { return( getUnicode( pDb, NULL, 0, 0, FLM_MAX_UINT, puiNumChars)); } - RCODE FLMAPI getUnicode( + RCODE XFLAPI getUnicode( IF_Db * pDb, FLMUNICODE * puzValueBuffer, FLMUINT uiBufferSize, @@ -5846,15 +5846,15 @@ public: FLMUINT * puiCharsReturned = NULL, FLMUINT * puiBufferBytesUsed = NULL); - RCODE FLMAPI getUnicode( + RCODE XFLAPI getUnicode( IF_Db * pDb, FLMUNICODE ** ppuzUnicodeValue); - RCODE FLMAPI getUnicode( + RCODE XFLAPI getUnicode( IF_Db * pDb, F_DynaBuf * pDynaBuf); - RCODE FLMAPI getUTF8( + RCODE XFLAPI getUTF8( IF_Db * pDb, FLMBYTE * pszValueBuffer, FLMUINT uiBufferSize, @@ -5863,26 +5863,26 @@ public: FLMUINT * puiCharsReturned = NULL, FLMUINT * puiBufferBytesUsed = NULL); - RCODE FLMAPI getUTF8( + RCODE XFLAPI getUTF8( IF_Db * pDb, FLMBYTE ** ppszUTF8Value); - RCODE FLMAPI getUTF8( + RCODE XFLAPI getUTF8( IF_Db * pDb, F_DynaBuf * pDynaBuf); - RCODE FLMAPI getBinary( + RCODE XFLAPI getBinary( IF_Db * pDb, void * pvValue, FLMUINT uiByteOffset, FLMUINT uiBytesRequested, FLMUINT * puiBytesReturned); - RCODE FLMAPI getBinary( + RCODE XFLAPI getBinary( IF_Db * pDb, F_DynaBuf * pBuffer); - FINLINE RCODE FLMAPI getAttributeValueUINT32( + FINLINE RCODE XFLAPI getAttributeValueUINT32( IF_Db * pDb, FLMUINT uiAttrName, FLMUINT32 * pui32Num) @@ -5900,7 +5900,7 @@ public: return( convertToUINT32( ui64Num, bNeg, pui32Num)); } - FINLINE RCODE FLMAPI getAttributeValueUINT32( + FINLINE RCODE XFLAPI getAttributeValueUINT32( IF_Db * pDb, FLMUINT uiAttrName, FLMUINT32 * pui32Num, @@ -5923,7 +5923,7 @@ public: return( rc); } - FINLINE RCODE FLMAPI getAttributeValueUINT( + FINLINE RCODE XFLAPI getAttributeValueUINT( IF_Db * pDb, FLMUINT uiAttrName, FLMUINT * puiNum) @@ -5941,7 +5941,7 @@ public: return( convertToUINT( ui64Num, bNeg, puiNum)); } - FINLINE RCODE FLMAPI getAttributeValueUINT( + FINLINE RCODE XFLAPI getAttributeValueUINT( IF_Db * pDb, FLMUINT uiAttrName, FLMUINT * puiNum, @@ -5964,7 +5964,7 @@ public: return( rc); } - FINLINE RCODE FLMAPI getAttributeValueUINT64( + FINLINE RCODE XFLAPI getAttributeValueUINT64( IF_Db * pDb, FLMUINT uiAttrName, FLMUINT64 * pui64Num) @@ -5982,7 +5982,7 @@ public: return( convertToUINT64( ui64Num, bNeg, pui64Num)); } - FINLINE RCODE FLMAPI getAttributeValueUINT64( + FINLINE RCODE XFLAPI getAttributeValueUINT64( IF_Db * pDb, FLMUINT uiAttrName, FLMUINT64 * pui64Num, @@ -6005,7 +6005,7 @@ public: return( rc); } - FINLINE RCODE FLMAPI getAttributeValueINT( + FINLINE RCODE XFLAPI getAttributeValueINT( IF_Db * pDb, FLMUINT uiAttrName, FLMINT * piNum) @@ -6023,7 +6023,7 @@ public: return( convertToINT( ui64Num, bNeg, piNum)); } - FINLINE RCODE FLMAPI getAttributeValueINT( + FINLINE RCODE XFLAPI getAttributeValueINT( IF_Db * pDb, FLMUINT uiAttrName, FLMINT * piNum, @@ -6046,7 +6046,7 @@ public: return( rc); } - FINLINE RCODE FLMAPI getAttributeValueINT64( + FINLINE RCODE XFLAPI getAttributeValueINT64( IF_Db * pDb, FLMUINT uiAttrName, FLMINT64 * pi64Num) @@ -6064,7 +6064,7 @@ public: return( convertToINT64( ui64Num, bNeg, pi64Num)); } - FINLINE RCODE FLMAPI getAttributeValueINT64( + FINLINE RCODE XFLAPI getAttributeValueINT64( IF_Db * pDb, FLMUINT uiAttrName, FLMINT64 * pi64Num, @@ -6087,7 +6087,7 @@ public: return( rc); } - FINLINE RCODE FLMAPI getAttributeValueUnicode( + FINLINE RCODE XFLAPI getAttributeValueUnicode( IF_Db * pDb, FLMUINT uiAttrName, FLMUNICODE * puzValueBuffer, @@ -6099,17 +6099,17 @@ public: puzValueBuffer, uiBufferSize, puiCharsReturned, puiBufferBytesUsed)); } - RCODE FLMAPI getAttributeValueUnicode( + RCODE XFLAPI getAttributeValueUnicode( IF_Db * pDb, FLMUINT uiAttrName, FLMUNICODE ** ppuzValueBuffer); - RCODE FLMAPI getAttributeValueUnicode( + RCODE XFLAPI getAttributeValueUnicode( IF_Db * pDb, FLMUINT uiAttrName, F_DynaBuf * pDynaBuf); - RCODE FLMAPI getAttributeValueUTF8( + RCODE XFLAPI getAttributeValueUTF8( IF_Db * pDb, FLMUINT uiAttrName, FLMBYTE * pucValueBuffer, @@ -6121,29 +6121,29 @@ public: pucValueBuffer, uiBufferSize, puiCharsReturned, puiBufferBytesUsed)); } - RCODE FLMAPI getAttributeValueUTF8( + RCODE XFLAPI getAttributeValueUTF8( IF_Db * pDb, FLMUINT uiAttrNameId, FLMBYTE ** ppszValueBuffer); - RCODE FLMAPI getAttributeValueUTF8( + RCODE XFLAPI getAttributeValueUTF8( IF_Db * pDb, FLMUINT uiAttrName, F_DynaBuf * pDynaBuf); - RCODE FLMAPI getAttributeValueBinary( + RCODE XFLAPI getAttributeValueBinary( IF_Db * pDb, FLMUINT uiAttrName, void * pvValueBuffer, FLMUINT uiBufferSize, FLMUINT * puiValueLength); - RCODE FLMAPI getAttributeValueBinary( + RCODE XFLAPI getAttributeValueBinary( IF_Db * pDb, FLMUINT uiAttrName, F_DynaBuf * pDynaBuf); - FINLINE RCODE FLMAPI setUINT( + FINLINE RCODE XFLAPI setUINT( IF_Db * pDb, FLMUINT uiValue, FLMUINT uiEncDefId = 0) @@ -6151,7 +6151,7 @@ public: return( setNumber64( pDb, 0, uiValue, uiEncDefId)); } - FINLINE RCODE FLMAPI setUINT64( + FINLINE RCODE XFLAPI setUINT64( IF_Db * pDb, FLMUINT64 ui64Value, FLMUINT uiEncDefId = 0) @@ -6159,7 +6159,7 @@ public: return( setNumber64( pDb, 0, ui64Value, uiEncDefId)); } - FINLINE RCODE FLMAPI setINT( + FINLINE RCODE XFLAPI setINT( IF_Db * pDb, FLMINT iValue, FLMUINT uiEncDefId = 0) @@ -6167,7 +6167,7 @@ public: return( setNumber64( pDb, iValue, 0, uiEncDefId)); } - FINLINE RCODE FLMAPI setINT64( + FINLINE RCODE XFLAPI setINT64( IF_Db * pDb, FLMINT64 i64Value, FLMUINT uiEncDefId = 0) @@ -6175,11 +6175,11 @@ public: return( setNumber64( pDb, i64Value, 0, uiEncDefId)); } - RCODE FLMAPI setMetaValue( + RCODE XFLAPI setMetaValue( IF_Db * pDb, FLMUINT64 ui64Value); - FINLINE RCODE FLMAPI setUnicode( + FINLINE RCODE XFLAPI setUnicode( IF_Db * pDb, const FLMUNICODE * puzValue, FLMUINT uiValueLength = 0, @@ -6200,7 +6200,7 @@ public: } } - FINLINE RCODE FLMAPI setUTF8( + FINLINE RCODE XFLAPI setUTF8( IF_Db * pDb, const FLMBYTE * pszValue, FLMUINT uiValueLength = 0, @@ -6221,7 +6221,7 @@ public: } } - FINLINE RCODE FLMAPI setBinary( + FINLINE RCODE XFLAPI setBinary( IF_Db * pDb, const void * pvValue, FLMUINT uiValueLength, @@ -6242,7 +6242,7 @@ public: } } - FINLINE RCODE FLMAPI setAttributeValueUINT( + FINLINE RCODE XFLAPI setAttributeValueUINT( IF_Db * pDb, FLMUINT uiAttrName, FLMUINT uiValue, @@ -6252,7 +6252,7 @@ public: 0, uiValue, uiEncDefId)); } - FINLINE RCODE FLMAPI setAttributeValueUINT64( + FINLINE RCODE XFLAPI setAttributeValueUINT64( IF_Db * pDb, FLMUINT uiAttrName, FLMUINT64 ui64Value, @@ -6262,7 +6262,7 @@ public: 0, ui64Value, uiEncDefId)); } - FINLINE RCODE FLMAPI setAttributeValueINT( + FINLINE RCODE XFLAPI setAttributeValueINT( IF_Db * pDb, FLMUINT uiAttrName, FLMINT iValue, @@ -6272,7 +6272,7 @@ public: iValue, 0, uiEncDefId)); } - FINLINE RCODE FLMAPI setAttributeValueINT64( + FINLINE RCODE XFLAPI setAttributeValueINT64( IF_Db * pDb, FLMUINT uiAttrName, FLMINT64 i64Value, @@ -6282,91 +6282,91 @@ public: i64Value, 0, uiEncDefId)); } - RCODE FLMAPI setAttributeValueUnicode( + RCODE XFLAPI setAttributeValueUnicode( IF_Db * pDb, FLMUINT uiAttrName, const FLMUNICODE * puzValue, FLMUINT uiEncDefId = 0); - RCODE FLMAPI setAttributeValueUTF8( + RCODE XFLAPI setAttributeValueUTF8( IF_Db * pDb, FLMUINT uiAttrName, const FLMBYTE * pszValue, FLMUINT uiLength, FLMUINT uiEncDefId = 0); - RCODE FLMAPI setAttributeValueBinary( + RCODE XFLAPI setAttributeValueBinary( IF_Db * pDb, FLMUINT uiAttrName, const void * pvValue, FLMUINT uiLength, FLMUINT uiEncDefId = 0); - RCODE FLMAPI getDocumentNode( + RCODE XFLAPI getDocumentNode( IF_Db * pDb, IF_DOMNode ** ppDocument); - RCODE FLMAPI getNextDocument( + RCODE XFLAPI getNextDocument( IF_Db * pDb, IF_DOMNode ** ppNextDocument); - RCODE FLMAPI getPreviousDocument( + RCODE XFLAPI getPreviousDocument( IF_Db * pDb, IF_DOMNode ** ppPrevDocument); - RCODE FLMAPI getParentNode( + RCODE XFLAPI getParentNode( IF_Db * pDb, IF_DOMNode ** ppParent); - RCODE FLMAPI getFirstChild( + RCODE XFLAPI getFirstChild( IF_Db * pDb, IF_DOMNode ** ppFirstChild); - RCODE FLMAPI getLastChild( + RCODE XFLAPI getLastChild( IF_Db * pDb, IF_DOMNode ** ppLastChild); - RCODE FLMAPI getNextSibling( + RCODE XFLAPI getNextSibling( IF_Db * pDb, IF_DOMNode ** ppNextSibling); - RCODE FLMAPI getPreviousSibling( + RCODE XFLAPI getPreviousSibling( IF_Db * pDb, IF_DOMNode ** ppPrevSibling); - RCODE FLMAPI getChild( + RCODE XFLAPI getChild( IF_Db * pDb, eDomNodeType eNodeType, IF_DOMNode ** ppChild); - RCODE FLMAPI getChildElement( + RCODE XFLAPI getChildElement( IF_Db * pDb, FLMUINT uiElementNameId, IF_DOMNode ** ppChild, FLMUINT uiFlags = 0); - RCODE FLMAPI getSiblingElement( + RCODE XFLAPI getSiblingElement( IF_Db * pDb, FLMUINT uiElementNameId, FLMBOOL bNext, IF_DOMNode ** ppSibling); - RCODE FLMAPI getAncestorElement( + RCODE XFLAPI getAncestorElement( IF_Db * pDb, FLMUINT uiElementNameId, IF_DOMNode ** ppAncestor); - RCODE FLMAPI getDescendantElement( + RCODE XFLAPI getDescendantElement( IF_Db * pDb, FLMUINT uiElementNameId, IF_DOMNode ** ppDescendant); - RCODE FLMAPI insertBefore( + RCODE XFLAPI insertBefore( IF_Db * pDb, IF_DOMNode * pNewChild, IF_DOMNode * pRefChild); - FINLINE RCODE FLMAPI getPrefix( + FINLINE RCODE XFLAPI getPrefix( IF_Db * pDb, FLMUNICODE * puzPrefixBuffer, FLMUINT uiBufferSize, @@ -6376,7 +6376,7 @@ public: puiCharsReturned)); } - FINLINE RCODE FLMAPI getPrefix( + FINLINE RCODE XFLAPI getPrefix( IF_Db * pDb, char * pszPrefixBuffer, FLMUINT uiBufferSize, @@ -6386,29 +6386,29 @@ public: puiCharsReturned)); } - RCODE FLMAPI getPrefixId( + RCODE XFLAPI getPrefixId( IF_Db * pDb, FLMUINT * puiPrefixId); - FINLINE RCODE FLMAPI setPrefix( + FINLINE RCODE XFLAPI setPrefix( IF_Db * pDb, const FLMUNICODE * puzPrefix) { return setPrefix( TRUE, pDb, (void *)puzPrefix); } - FINLINE RCODE FLMAPI setPrefix( + FINLINE RCODE XFLAPI setPrefix( IF_Db * pDb, const char * pszPrefix) { return setPrefix( FALSE, pDb, (void *)pszPrefix); } - RCODE FLMAPI setPrefixId( + RCODE XFLAPI setPrefixId( IF_Db * pDb, FLMUINT uiPrefixId); - FINLINE RCODE FLMAPI getNamespaceURI( + FINLINE RCODE XFLAPI getNamespaceURI( IF_Db * pDb, FLMUNICODE * puzNamespaceURIBuffer, FLMUINT uiBufferSize, @@ -6418,7 +6418,7 @@ public: (void *)puzNamespaceURIBuffer, uiBufferSize, puiCharsReturned); } - FINLINE RCODE FLMAPI getNamespaceURI( + FINLINE RCODE XFLAPI getNamespaceURI( IF_Db * pDb, char * pszNamespaceURIBuffer, FLMUINT uiBufferSize, @@ -6428,7 +6428,7 @@ public: (void *)pszNamespaceURIBuffer, uiBufferSize, puiCharsReturned); } - FINLINE RCODE FLMAPI getLocalName( + FINLINE RCODE XFLAPI getLocalName( IF_Db * pDb, FLMUNICODE * puzLocalNameBuffer, FLMUINT uiBufferSize, @@ -6438,7 +6438,7 @@ public: uiBufferSize, puiCharsReturned)); } - FINLINE RCODE FLMAPI getLocalName( + FINLINE RCODE XFLAPI getLocalName( IF_Db * pDb, char * pszLocalNameBuffer, FLMUINT uiBufferSize, @@ -6448,19 +6448,19 @@ public: puiCharsReturned)); } - RCODE FLMAPI getQualifiedName( + RCODE XFLAPI getQualifiedName( IF_Db * pDb, FLMUNICODE * puzQualifiedNameBuffer, FLMUINT uiBufferSize, FLMUINT * puiCharsReturned); - RCODE FLMAPI getQualifiedName( + RCODE XFLAPI getQualifiedName( IF_Db * pDb, char * pszQualifiedNameBuffer, FLMUINT uiBufferSize, FLMUINT * puiCharsReturned); - FINLINE RCODE FLMAPI getCollection( + FINLINE RCODE XFLAPI getCollection( IF_Db *, // pDb, FLMUINT * puiCollection) { @@ -6468,24 +6468,24 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI createAnnotation( + RCODE XFLAPI createAnnotation( IF_Db * pDb, IF_DOMNode ** ppAnnotation, FLMUINT64 * pui64NodeId = NULL); - RCODE FLMAPI getAnnotation( + RCODE XFLAPI getAnnotation( IF_Db * pDb, IF_DOMNode ** ppAnnotation); - RCODE FLMAPI getAnnotationId( + RCODE XFLAPI getAnnotationId( IF_Db * pDb, FLMUINT64 * pui64AnnotationId); - RCODE FLMAPI hasAnnotation( + RCODE XFLAPI hasAnnotation( IF_Db * pDb, FLMBOOL * pbHasAnnotation); - FINLINE RCODE FLMAPI getIStream( + FINLINE RCODE XFLAPI getIStream( IF_Db * pDb, IF_PosIStream ** ppIStream, FLMUINT * puiDataType = NULL, @@ -6495,7 +6495,7 @@ public: puiDataType, puiDataLength)); } - FINLINE RCODE FLMAPI getTextIStream( + FINLINE RCODE XFLAPI getTextIStream( IF_Db * pDb, IF_PosIStream ** ppIStream, FLMUINT * puiNumChars = NULL) @@ -6503,14 +6503,14 @@ public: return( getTextIStream( (F_Db *)pDb, NULL, ppIStream, puiNumChars)); } - FLMUINT FLMAPI compareNode( + FLMUINT XFLAPI compareNode( IF_DOMNode * pNode, IF_Db * pDb1, IF_Db * pDb2, char * pszErrBuff, FLMUINT uiErrBuffLen); - RCODE FLMAPI isDataLocalToNode( + RCODE XFLAPI isDataLocalToNode( IF_Db * pDb, FLMBOOL * pbDataIsLocal); @@ -6526,7 +6526,7 @@ public: return( FALSE); } - RCODE FLMAPI setTextFastPath( + RCODE XFLAPI setTextFastPath( F_Db * pDb, const void * pvValue, FLMUINT uiNumBytesInBuffer, @@ -8040,32 +8040,32 @@ public: m_uiNumCollections = 0; } - FINLINE FLMUINT FLMAPI getNumCollections( void) + FINLINE FLMUINT XFLAPI getNumCollections( void) { return( m_uiNumCollections); } - FINLINE FLMUINT FLMAPI getNumIndexes( void) + FINLINE FLMUINT XFLAPI getNumIndexes( void) { return( m_uiNumIndexes); } - FINLINE FLMUINT FLMAPI getNumLogicalFiles( void) + FINLINE FLMUINT XFLAPI getNumLogicalFiles( void) { return( m_uiNumLogicalFiles); } - FINLINE FLMUINT64 FLMAPI getFileSize( void) + FINLINE FLMUINT64 XFLAPI getFileSize( void) { return( m_ui64FileSize); } - FINLINE XFLM_DB_HDR * FLMAPI getDbHdr( void) + FINLINE XFLM_DB_HDR * XFLAPI getDbHdr( void) { return( &m_dbHdr); } - FINLINE void FLMAPI getAvailBlockStats( + FINLINE void XFLAPI getAvailBlockStats( FLMUINT64 * pui64BytesUsed, FLMUINT * puiBlockCount, FLMINT32 * pi32LastError, @@ -8077,7 +8077,7 @@ public: *puiNumErrors = m_AvailBlocks.uiNumErrors; } - FINLINE void FLMAPI getLFHBlockStats( + FINLINE void XFLAPI getLFHBlockStats( FLMUINT64 * pui64BytesUsed, FLMUINT * puiBlockCount, FLMINT32 * pi32LastError, @@ -8089,14 +8089,14 @@ public: *puiNumErrors = m_LFHBlocks.uiNumErrors; } - void FLMAPI getBTreeInfo( + void XFLAPI getBTreeInfo( FLMUINT uiNthLogicalFile, FLMUINT * puiLfNum, eLFileType * peLfType, FLMUINT * puiRootBlkAddress, FLMUINT * puiNumLevels); - void FLMAPI getBTreeBlockStats( + void XFLAPI getBTreeBlockStats( FLMUINT uiNthLogicalFile, FLMUINT uiLevel, FLMUINT64 * pui64KeyCount, @@ -8461,7 +8461,7 @@ FINLINE RCODE F_NodeCacheMgr::makeWriteCopy( /**************************************************************************** Desc: *****************************************************************************/ -class FLMEXP F_SuperFileClient : public IF_SuperFileClient +class XFLEXP F_SuperFileClient : public IF_SuperFileClient { public: @@ -8474,21 +8474,21 @@ public: const char * pszDataDir, FLMUINT uiMaxFileSize); - FLMUINT FLMAPI getFileNumber( + FLMUINT XFLAPI getFileNumber( FLMUINT uiBlockAddr); - FLMUINT FLMAPI getFileOffset( + FLMUINT XFLAPI getFileOffset( FLMUINT uiBlockAddr); - FLMUINT FLMAPI getBlockAddress( + FLMUINT XFLAPI getBlockAddress( FLMUINT uiFileNumber, FLMUINT uiFileOffset); - RCODE FLMAPI getFilePath( + RCODE XFLAPI getFilePath( FLMUINT uiFileNumber, char * pszPath); - FLMUINT64 FLMAPI getMaxFileSize( void); + FLMUINT64 XFLAPI getMaxFileSize( void); static void bldSuperFileExtension( FLMUINT uiFileNum, diff --git a/xflaim/src/flbackup.cpp b/xflaim/src/flbackup.cpp index 7c5889a..c96ccc1 100644 --- a/xflaim/src/flbackup.cpp +++ b/xflaim/src/flbackup.cpp @@ -84,10 +84,10 @@ private: RCODE _setup( void); - static RCODE FLMAPI readThread( + static RCODE XFLAPI readThread( IF_Thread * pThread); - static RCODE FLMAPI writeThread( + static RCODE XFLAPI writeThread( IF_Thread * pThread); FLMBOOL m_bSetup; @@ -2445,7 +2445,7 @@ Exit: /**************************************************************************** Desc: This thread reads data in the background ****************************************************************************/ -RCODE FLMAPI F_BackerStream::readThread( +RCODE XFLAPI F_BackerStream::readThread( IF_Thread * pThread) { F_BackerStream * pBackerStream = (F_BackerStream *)pThread->getParm1(); @@ -2484,7 +2484,7 @@ Exit: /**************************************************************************** Desc: This thread writes data in the background ****************************************************************************/ -RCODE FLMAPI F_BackerStream::writeThread( +RCODE XFLAPI F_BackerStream::writeThread( IF_Thread * pThread) { F_BackerStream * pBackerStream = (F_BackerStream *)pThread->getParm1(); diff --git a/xflaim/src/flblddb.cpp b/xflaim/src/flblddb.cpp index ac9ebf3..fd67886 100644 --- a/xflaim/src/flblddb.cpp +++ b/xflaim/src/flblddb.cpp @@ -121,9 +121,9 @@ public: F_DbRebuild * pRebuild, FLMBOOL bRecovDictionary); - RCODE FLMAPI closeStream( void); + RCODE XFLAPI closeStream( void); - RCODE FLMAPI read( + RCODE XFLAPI read( void * pvBuffer, FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); @@ -200,7 +200,7 @@ Desc: Comparison object for node result sets ***************************************************************************/ class F_NodeResultSetCompare : public IF_ResultSetCompare { - inline RCODE FLMAPI compare( + inline RCODE XFLAPI compare( const void * pvData1, FLMUINT uiLength1, const void * pvData2, @@ -265,12 +265,12 @@ class F_NodeResultSetCompare : public IF_ResultSetCompare return( NE_XFLM_OK); } - virtual FLMINT FLMAPI AddRef( void) + virtual FLMINT XFLAPI AddRef( void) { return( IF_ResultSetCompare::AddRef()); } - virtual FLMINT FLMAPI Release( void) + virtual FLMINT XFLAPI Release( void) { return( IF_ResultSetCompare::Release()); } @@ -1832,7 +1832,7 @@ Notes: All the important stuff is handled by the F_DbRebuild::dbRebuild function (below). All this call does is create an F_DbRebuild object, call dbRebuild on it, delete the obj and return the RCODE. ****************************************************************************/ -RCODE FLMAPI F_DbSystem::dbRebuild( +RCODE XFLAPI F_DbSystem::dbRebuild( const char * pszSourceDbPath, const char * pszSourceDataDir, const char * pszDestDbPath, diff --git a/xflaim/src/flchkdb.cpp b/xflaim/src/flchkdb.cpp index 4fa9208..59640a9 100644 --- a/xflaim/src/flchkdb.cpp +++ b/xflaim/src/flchkdb.cpp @@ -783,7 +783,7 @@ Exit: Desc: Returns the next B-Tree information that was collected during the database check. ****************************************************************************/ -void FLMAPI F_DbInfo::getBTreeInfo( +void XFLAPI F_DbInfo::getBTreeInfo( FLMUINT uiNthLogicalFile, FLMUINT * puiLfNum, eLFileType * peLfType, @@ -814,7 +814,7 @@ void FLMAPI F_DbInfo::getBTreeInfo( Desc: Returns block information on the specified b-tree and level within that b-tree. ****************************************************************************/ -void FLMAPI F_DbInfo::getBTreeBlockStats( +void XFLAPI F_DbInfo::getBTreeBlockStats( FLMUINT uiNthLogicalFile, FLMUINT uiLevel, FLMUINT64 * pui64KeyCount, @@ -865,7 +865,7 @@ Note: The routine verifies the database by first reading through verify the linked lists, we can keep ourselves from getting into an infinite loop if there is a loop in the lists. ****************************************************************************/ -RCODE FLMAPI F_DbSystem::dbCheck( +RCODE XFLAPI F_DbSystem::dbCheck( const char * pszDbFileName, // [IN] Full path and file name of the database which // is to be checked. NULL can be passed as the value of diff --git a/xflaim/src/flclose.cpp b/xflaim/src/flclose.cpp index 376eac3..48ba5a3 100644 --- a/xflaim/src/flclose.cpp +++ b/xflaim/src/flclose.cpp @@ -132,7 +132,7 @@ F_Db::~F_Db() /**************************************************************************** Desc: Wait for a specific database to close ****************************************************************************/ -RCODE FLMAPI F_DbSystem::waitToClose( +RCODE XFLAPI F_DbSystem::waitToClose( const char * pszDbPath) { RCODE rc = NE_XFLM_OK; diff --git a/xflaim/src/flconvrt.cpp b/xflaim/src/flconvrt.cpp index 62837d8..6dcd8ae 100644 --- a/xflaim/src/flconvrt.cpp +++ b/xflaim/src/flconvrt.cpp @@ -28,7 +28,7 @@ /**************************************************************************** Desc : Upgrades a database to the latest FLAIM version. ****************************************************************************/ -RCODE FLMAPI F_Db::upgrade( +RCODE XFLAPI F_Db::upgrade( IF_UpgradeClient * // pUpgradeClient ) { @@ -220,7 +220,7 @@ Exit: /************************************************************************ Desc : Enable encryption on the database. *************************************************************************/ -RCODE FLMAPI F_Db::enableEncryption( void) +RCODE XFLAPI F_Db::enableEncryption( void) { RCODE rc = NE_XFLM_OK; F_Rfl * pRfl = m_pDatabase->m_pRfl; @@ -352,7 +352,7 @@ Desc : Change the database key from wrapped in the NICI server NICI server key. If a password is specified, the key will be shrouded in it. ****************************************************************************/ -RCODE FLMAPI F_Db::wrapKey( +RCODE XFLAPI F_Db::wrapKey( const char * pszPassword) { RCODE rc = NE_XFLM_OK; @@ -556,7 +556,7 @@ Desc : Generate a new database key and re-wrap all existing keys in it NOTE: New database key will be wrapped in NICI server key, even if the previous key was wrapped in a password. ****************************************************************************/ -RCODE FLMAPI F_Db::rollOverDbKey( void) +RCODE XFLAPI F_Db::rollOverDbKey( void) { RCODE rc = NE_XFLM_OK; F_Rfl * pRfl = m_pDatabase->m_pRfl; diff --git a/xflaim/src/flcreate.cpp b/xflaim/src/flcreate.cpp index bdcce21..70ae9b7 100644 --- a/xflaim/src/flcreate.cpp +++ b/xflaim/src/flcreate.cpp @@ -28,7 +28,7 @@ /*API~*********************************************************************** Desc: Creates a new FLAIM database. *END************************************************************************/ -RCODE FLMAPI F_DbSystem::dbCreate( +RCODE XFLAPI F_DbSystem::dbCreate( const char * pszFilePath, // [IN] Full path file name of the database which is to be created. const char * pszDataDir, diff --git a/xflaim/src/flerror.cpp b/xflaim/src/flerror.cpp index 394326a..d9750da 100644 --- a/xflaim/src/flerror.cpp +++ b/xflaim/src/flerror.cpp @@ -249,7 +249,7 @@ Exit: Desc: Returns a pointer to the string representation of a corruption error code. ****************************************************************************/ -const char * FLMAPI F_DbSystem::checkErrorToStr( +const char * XFLAPI F_DbSystem::checkErrorToStr( FLMINT iCheckErrorCode) { if( (iCheckErrorCode >= 1) && (iCheckErrorCode <= FLM_NUM_CORRUPT_ERRORS)) diff --git a/xflaim/src/flindex.cpp b/xflaim/src/flindex.cpp index 417a2f2..bc39d08 100644 --- a/xflaim/src/flindex.cpp +++ b/xflaim/src/flindex.cpp @@ -25,14 +25,14 @@ #include "flaimsys.h" -FSTATIC RCODE FLMAPI flmBackgroundIndexBuildThrd( +FSTATIC RCODE XFLAPI flmBackgroundIndexBuildThrd( IF_Thread * pThread); /**************************************************************************** Desc : Return the status of the index. Notes: ****************************************************************************/ -RCODE FLMAPI F_Db::indexStatus( +RCODE XFLAPI F_Db::indexStatus( FLMUINT uiIndexNum, XFLM_INDEX_STATUS * pIndexStatus) { @@ -133,7 +133,7 @@ Exit: Desc: Return the number of the next index. Pass in zero to get the first index. ****************************************************************************/ -RCODE FLMAPI F_Db::indexGetNext( +RCODE XFLAPI F_Db::indexGetNext( FLMUINT * puiIndexNum) { RCODE rc = NE_XFLM_OK; @@ -1015,7 +1015,7 @@ Desc: Thread that will build an index in the background. Caller will create a pDb to use. This pDb must be freed at the conclusion of the routine. ****************************************************************************/ -FSTATIC RCODE FLMAPI flmBackgroundIndexBuildThrd( +FSTATIC RCODE XFLAPI flmBackgroundIndexBuildThrd( IF_Thread * pThread) { RCODE rc = NE_XFLM_OK; diff --git a/xflaim/src/flopen.cpp b/xflaim/src/flopen.cpp index d188ac1..7c26bd4 100644 --- a/xflaim/src/flopen.cpp +++ b/xflaim/src/flopen.cpp @@ -30,7 +30,7 @@ FSTATIC void flmFreeCPInfo( CP_INFO ** ppCPInfoRV); -FSTATIC RCODE FLMAPI flmCPThread( +FSTATIC RCODE XFLAPI flmCPThread( IF_Thread * pThread); /*************************************************************************** @@ -1854,7 +1854,7 @@ Desc: This routine functions as a thread. It monitors open files and frees up files which have been closed longer than the maximum close time. ****************************************************************************/ -FSTATIC RCODE FLMAPI flmCPThread( +FSTATIC RCODE XFLAPI flmCPThread( IF_Thread * pThread) { CP_INFO * pCPInfo = (CP_INFO *)pThread->getParm1(); diff --git a/xflaim/src/flreduce.cpp b/xflaim/src/flreduce.cpp index eb35cf1..0516294 100644 --- a/xflaim/src/flreduce.cpp +++ b/xflaim/src/flreduce.cpp @@ -34,7 +34,7 @@ Notes: The size of the database file is reduced by freeing a specified available block list is empty, FLAIM will attemp to add blocks to the list by freeing log extent blocks. ****************************************************************************/ -RCODE FLMAPI F_Db::reduceSize( +RCODE XFLAPI F_Db::reduceSize( FLMUINT uiCount, FLMUINT * puiCount) { diff --git a/xflaim/src/fltrbeg.cpp b/xflaim/src/fltrbeg.cpp index 9e18c5c..187cc6f 100644 --- a/xflaim/src/fltrbeg.cpp +++ b/xflaim/src/fltrbeg.cpp @@ -594,7 +594,7 @@ Exit: Area : TRANSACTION Desc : Starts a transaction. *END************************************************************************/ -RCODE FLMAPI F_Db::transBegin( +RCODE XFLAPI F_Db::transBegin( eDbTransType eTransType, // [IN] Specifies the type of transaction to begin. // Possible values are: @@ -668,7 +668,7 @@ Exit: Area : TRANSACTION Desc : Starts a transaction. *END************************************************************************/ -RCODE FLMAPI F_Db::transBegin( +RCODE XFLAPI F_Db::transBegin( IF_Db * pDb // [IN] Start a transaction that has the same view as whatever // transaction is running on this database. NOTE: If pDb is @@ -712,7 +712,7 @@ Exit: Area : TRANSACTION Desc : Obtains a a lock on the database. *END************************************************************************/ -RCODE FLMAPI F_Db::dbLock( +RCODE XFLAPI F_Db::dbLock( eLockType lockType, // [IN] Type of lock request - must be FLM_LOCK_EXCLUSIVE or // FLM_LOCK_SHARED @@ -775,7 +775,7 @@ Exit: Area : TRANSACTION Desc : Releases a lock on the database *END************************************************************************/ -RCODE FLMAPI F_Db::dbUnlock( void) +RCODE XFLAPI F_Db::dbUnlock( void) { RCODE rc = NE_XFLM_OK; @@ -816,7 +816,7 @@ Area : TRANSACTION Desc : Returns information about current and pending locks on the database. *END************************************************************************/ -RCODE FLMAPI F_Db::getLockInfo( +RCODE XFLAPI F_Db::getLockInfo( FLMINT iPriority, // [IN] A count of all locks with a priority >= to this priority // level will be returned in pLockInfo. @@ -848,7 +848,7 @@ Exit: Desc : Returns information about the lock held by the specified database handle. *END************************************************************************/ -RCODE FLMAPI F_Db::getLockType( +RCODE XFLAPI F_Db::getLockType( eLockType * pLockType, FLMBOOL * pbImplicit) { @@ -900,7 +900,7 @@ Exit: Area : TRANSACTION Desc : Forces a checkpoint on the database. *END************************************************************************/ -RCODE FLMAPI F_Db::doCheckpoint( +RCODE XFLAPI F_Db::doCheckpoint( FLMUINT uiTimeout // [IN] Seconds to wait to obtain lock on the database. // FLM_NO_TIMEOUT means that it will wait forever for diff --git a/xflaim/src/fltrcmit.cpp b/xflaim/src/fltrcmit.cpp index 635fd48..530985f 100644 --- a/xflaim/src/fltrcmit.cpp +++ b/xflaim/src/fltrcmit.cpp @@ -565,7 +565,7 @@ Exit: Area : TRANSACTION Desc : Commits an active transaction. *END************************************************************************/ -RCODE FLMAPI F_Db::transCommit( +RCODE XFLAPI F_Db::transCommit( FLMBOOL * pbEmpty) // may be NULL { RCODE rc = NE_XFLM_OK; diff --git a/xflaim/src/flverify.cpp b/xflaim/src/flverify.cpp index f9e9a70..fb812c8 100644 --- a/xflaim/src/flverify.cpp +++ b/xflaim/src/flverify.cpp @@ -4104,7 +4104,7 @@ FSTATIC FLMBYTE * getEntryEnd( Desc: Compare two cache blocks during a sort to determine which one has lower address. *****************************************************************************/ -FINLINE FLMINT FLMAPI blkSortCompare( +FINLINE FLMINT XFLAPI blkSortCompare( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -4129,7 +4129,7 @@ FINLINE FLMINT FLMAPI blkSortCompare( /*************************************************************************** Desc: Swap two entries in cache table during sort. *****************************************************************************/ -FINLINE void FLMAPI blkSortSwap( +FINLINE void XFLAPI blkSortSwap( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) diff --git a/xflaim/src/fntable.cpp b/xflaim/src/fntable.cpp index 371515f..7eb89b1 100644 --- a/xflaim/src/fntable.cpp +++ b/xflaim/src/fntable.cpp @@ -2384,7 +2384,7 @@ Exit: /**************************************************************************** Desc: Increment use count on this object. ****************************************************************************/ -FLMINT FLMAPI F_NameTable::AddRef( void) +FLMINT XFLAPI F_NameTable::AddRef( void) { return( f_atomicInc( &m_refCnt)); } @@ -2392,7 +2392,7 @@ FLMINT FLMAPI F_NameTable::AddRef( void) /**************************************************************************** Desc: Decrement the use count and delete if use count goes to zero. ****************************************************************************/ -FLMINT FLMAPI F_NameTable::Release( void) +FLMINT XFLAPI F_NameTable::Release( void) { FLMINT iRefCnt; @@ -2462,7 +2462,7 @@ Exit: /**************************************************************************** Desc: Get the name for a dictionary item. ****************************************************************************/ -RCODE FLMAPI F_Db::getDictionaryName( +RCODE XFLAPI F_Db::getDictionaryName( FLMUINT uiDictType, FLMUINT uiDictNumber, char * pszName, @@ -2513,7 +2513,7 @@ Exit: /**************************************************************************** Desc: Get the name for a dictionary item. ****************************************************************************/ -RCODE FLMAPI F_Db::getDictionaryName( +RCODE XFLAPI F_Db::getDictionaryName( FLMUINT uiDictType, FLMUINT uiDictNumber, FLMUNICODE * puzName, diff --git a/xflaim/src/fqsort.cpp b/xflaim/src/fqsort.cpp index 05a48de..950a516 100644 --- a/xflaim/src/fqsort.cpp +++ b/xflaim/src/fqsort.cpp @@ -35,7 +35,7 @@ FSTATIC RCODE fqGetDocId( /*************************************************************************** Desc: Add a sort key to the query. ***************************************************************************/ -RCODE FLMAPI F_Query::addSortKey( +RCODE XFLAPI F_Query::addSortKey( void * pvSortKeyContext, FLMBOOL bChildToContext, FLMBOOL bElement, @@ -1316,7 +1316,7 @@ Exit: /*************************************************************************** Desc: Stop building the result set. ***************************************************************************/ -void FLMAPI F_Query::stopBuildingResultSet( void) +void XFLAPI F_Query::stopBuildingResultSet( void) { if (m_pSortResultSet) { @@ -1349,7 +1349,7 @@ void FLMAPI F_Query::stopBuildingResultSet( void) Desc: Build the query result set. This is the method that applications can call. It implies enabling of positioning. ***************************************************************************/ -RCODE FLMAPI F_Query::buildResultSet( +RCODE XFLAPI F_Query::buildResultSet( IF_Db * pDb, FLMUINT uiTimeLimit) { @@ -2254,7 +2254,7 @@ Exit: /*************************************************************************** Desc: Get previous node/document that passes query expression. ***************************************************************************/ -RCODE FLMAPI F_Query::positionTo( +RCODE XFLAPI F_Query::positionTo( IF_Db * ifpDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit, @@ -2418,7 +2418,7 @@ Exit: /*************************************************************************** Desc: Get previous node/document that passes query expression. ***************************************************************************/ -RCODE FLMAPI F_Query::positionTo( +RCODE XFLAPI F_Query::positionTo( IF_Db * ifpDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit, @@ -2567,7 +2567,7 @@ Exit: /*************************************************************************** Desc: Get current position. ***************************************************************************/ -RCODE FLMAPI F_Query::getPosition( +RCODE XFLAPI F_Query::getPosition( IF_Db * ifpDb, FLMUINT * puiPosition ) @@ -2646,7 +2646,7 @@ Exit: /*************************************************************************** Desc: Get count. Only works for queries that are building result sets. ***************************************************************************/ -RCODE FLMAPI F_Query::getCounts( +RCODE XFLAPI F_Query::getCounts( IF_Db * ifpDb, FLMUINT uiTimeLimit, FLMBOOL bPartialCountOk, diff --git a/xflaim/src/fquery.cpp b/xflaim/src/fquery.cpp index ebe559b..12a0f59 100644 --- a/xflaim/src/fquery.cpp +++ b/xflaim/src/fquery.cpp @@ -666,7 +666,7 @@ Exit: /*************************************************************************** Desc: Adds a unicode value to the query criteria. ***************************************************************************/ -RCODE FLMAPI F_Query::addUnicodeValue( +RCODE XFLAPI F_Query::addUnicodeValue( const FLMUNICODE * puzVal) { RCODE rc = NE_XFLM_OK; @@ -757,7 +757,7 @@ Exit: /*************************************************************************** Desc: Adds a UTF8 value to the query criteria. ***************************************************************************/ -RCODE FLMAPI F_Query::addUTF8Value( +RCODE XFLAPI F_Query::addUTF8Value( const char * pszVal, FLMUINT uiUTF8Len) { @@ -866,7 +866,7 @@ Exit: /*************************************************************************** Desc: Adds a binary value to the query criteria. ***************************************************************************/ -RCODE FLMAPI F_Query::addBinaryValue( +RCODE XFLAPI F_Query::addBinaryValue( const void * pvVal, FLMUINT uiValLen) { @@ -893,7 +893,7 @@ Exit: /*************************************************************************** Desc: Adds a UINT value to the query criteria. ***************************************************************************/ -RCODE FLMAPI F_Query::addUINTValue( +RCODE XFLAPI F_Query::addUINTValue( FLMUINT uiVal ) { @@ -916,7 +916,7 @@ Exit: /*************************************************************************** Desc: Adds an INT value to the query criteria. ***************************************************************************/ -RCODE FLMAPI F_Query::addINTValue( +RCODE XFLAPI F_Query::addINTValue( FLMINT iVal ) { @@ -939,7 +939,7 @@ Exit: /*************************************************************************** Desc: Adds a UINT64 value to the query criteria. ***************************************************************************/ -RCODE FLMAPI F_Query::addUINT64Value( +RCODE XFLAPI F_Query::addUINT64Value( FLMUINT64 ui64Val ) { @@ -962,7 +962,7 @@ Exit: /*************************************************************************** Desc: Adds an INT64 value to the query criteria. ***************************************************************************/ -RCODE FLMAPI F_Query::addINT64Value( +RCODE XFLAPI F_Query::addINT64Value( FLMINT64 i64Val ) { @@ -985,7 +985,7 @@ Exit: /*************************************************************************** Desc: Adds a BOOL value to the query criteria. ***************************************************************************/ -RCODE FLMAPI F_Query::addBoolean( +RCODE XFLAPI F_Query::addBoolean( FLMBOOL bVal, FLMBOOL bUnknown ) @@ -1013,7 +1013,7 @@ Exit: /*************************************************************************** Desc: Add an XPATH component ***************************************************************************/ -RCODE FLMAPI F_Query::addXPathComponent( +RCODE XFLAPI F_Query::addXPathComponent( eXPathAxisTypes eXPathAxis, eDomNodeType eNodeType, FLMUINT uiDictNum, @@ -1265,7 +1265,7 @@ FINLINE FLMBOOL hasContextPosTest( /*************************************************************************** Desc: Add an operator to the query expression ***************************************************************************/ -RCODE FLMAPI F_Query::addOperator( +RCODE XFLAPI F_Query::addOperator( eQueryOperators eOperator, FLMUINT uiCompareRules, IF_OperandComparer * pOpComparer) @@ -1807,7 +1807,7 @@ Exit: /*************************************************************************** Desc: Add a function to the query expression ***************************************************************************/ -RCODE FLMAPI F_Query::addFunction( +RCODE XFLAPI F_Query::addFunction( eQueryFunctions eFunction, IF_QueryValFunc * pFuncObj, FLMBOOL bHaveXPathExpr) @@ -10099,7 +10099,7 @@ FSTATIC void fqReleaseQueryExpr( /*************************************************************************** Desc: Release the resources of a query ***************************************************************************/ -void FLMAPI F_Query::resetQuery( void) +void XFLAPI F_Query::resetQuery( void) { if (m_pQuery) { @@ -12603,7 +12603,7 @@ Exit: /*************************************************************************** Desc: Get first node/document that passes query expression. ***************************************************************************/ -RCODE FLMAPI F_Query::getFirst( +RCODE XFLAPI F_Query::getFirst( IF_Db * ifpDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit) @@ -12800,7 +12800,7 @@ Exit: /*************************************************************************** Desc: Get last node/document that passes query expression. ***************************************************************************/ -RCODE FLMAPI F_Query::getLast( +RCODE XFLAPI F_Query::getLast( IF_Db * ifpDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit) @@ -12994,7 +12994,7 @@ Exit: /*************************************************************************** Desc: Get next node/document that passes query expression. ***************************************************************************/ -RCODE FLMAPI F_Query::getNext( +RCODE XFLAPI F_Query::getNext( IF_Db * ifpDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit, @@ -13175,7 +13175,7 @@ Exit: /*************************************************************************** Desc: Get previous node/document that passes query expression. ***************************************************************************/ -RCODE FLMAPI F_Query::getPrev( +RCODE XFLAPI F_Query::getPrev( IF_Db * ifpDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit, @@ -13356,7 +13356,7 @@ Exit: /*************************************************************************** Desc: Get current document that passes query expression. ***************************************************************************/ -RCODE FLMAPI F_Query::getCurrent( +RCODE XFLAPI F_Query::getCurrent( IF_Db * ifpDb, IF_DOMNode ** ppNode) { @@ -13480,7 +13480,7 @@ Exit: /*************************************************************************** Desc: Get statistics and optimization information. ***************************************************************************/ -RCODE FLMAPI F_Query::getStatsAndOptInfo( +RCODE XFLAPI F_Query::getStatsAndOptInfo( FLMUINT * puiNumOptInfos, XFLM_OPT_INFO ** ppOptInfo) { @@ -13584,7 +13584,7 @@ Exit: /*************************************************************************** Desc: Free the optimization info structure. ***************************************************************************/ -void FLMAPI F_Query::freeStatsAndOptInfo( +void XFLAPI F_Query::freeStatsAndOptInfo( XFLM_OPT_INFO ** ppOptInfo) { if (*ppOptInfo) @@ -13597,7 +13597,7 @@ void FLMAPI F_Query::freeStatsAndOptInfo( /**************************************************************************** Desc: Create an empty query object and return it's interface... ****************************************************************************/ -RCODE FLMAPI F_DbSystem::createIFQuery( +RCODE XFLAPI F_DbSystem::createIFQuery( IF_Query ** ppQuery) { RCODE rc = NE_XFLM_OK; @@ -13802,7 +13802,7 @@ Exit: /**************************************************************************** Desc: Setup duplicate handling for a query. ****************************************************************************/ -void FLMAPI F_Query::setDupHandling( +void XFLAPI F_Query::setDupHandling( FLMBOOL bRemoveDups ) { @@ -13820,7 +13820,7 @@ void FLMAPI F_Query::setDupHandling( /**************************************************************************** Desc: Set an index for the query. ****************************************************************************/ -RCODE FLMAPI F_Query::setIndex( +RCODE XFLAPI F_Query::setIndex( FLMUINT uiIndex ) { @@ -13844,7 +13844,7 @@ Exit: /**************************************************************************** Desc: Set an index for the query. ****************************************************************************/ -RCODE FLMAPI F_Query::getIndex( +RCODE XFLAPI F_Query::getIndex( IF_Db * ifpDb, FLMUINT * puiIndex, FLMBOOL * pbHaveMultiple) @@ -14348,7 +14348,7 @@ Exit: /**************************************************************************** Desc: Copy criteria from another query object. ****************************************************************************/ -RCODE FLMAPI F_Query::copyCriteria( +RCODE XFLAPI F_Query::copyCriteria( IF_Query * pSrcQuery ) { diff --git a/xflaim/src/fslfileu.cpp b/xflaim/src/fslfileu.cpp index 62cdecb..efc7608 100644 --- a/xflaim/src/fslfileu.cpp +++ b/xflaim/src/fslfileu.cpp @@ -2609,7 +2609,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_Database::maintenanceThread( +RCODE XFLAPI F_Database::maintenanceThread( IF_Thread * pThread) { RCODE rc = NE_XFLM_OK; diff --git a/xflaim/src/fstructs.h b/xflaim/src/fstructs.h index f01b6c9..23f8c49 100644 --- a/xflaim/src/fstructs.h +++ b/xflaim/src/fstructs.h @@ -1093,7 +1093,7 @@ private: FLMBOOL bCounts, FLMBOOL bHaveData); - static RCODE FLMAPI maintenanceThread( + static RCODE XFLAPI maintenanceThread( IF_Thread * pThread); F_Database * m_pNext; // Next F_Database structure in in name hash diff --git a/xflaim/src/fsysdata.cpp b/xflaim/src/fsysdata.cpp index 6c82bbc..bccd295 100644 --- a/xflaim/src/fsysdata.cpp +++ b/xflaim/src/fsysdata.cpp @@ -837,7 +837,7 @@ Desc: This routine functions as a thread. It monitors open files and frees up files which have been closed longer than the maximum close time. ****************************************************************************/ -RCODE FLMAPI F_DbSystem::monitorThrd( +RCODE XFLAPI F_DbSystem::monitorThrd( IF_Thread * pThread) { FLMUINT uiCurrTime; @@ -1949,7 +1949,7 @@ void F_GlobalCacheMgr::getCacheInfo( Desc: Close all files in the file handle cache that have not been used for the specified number of seconds. ****************************************************************************/ -RCODE FLMAPI F_DbSystem::closeUnusedFiles( +RCODE XFLAPI F_DbSystem::closeUnusedFiles( FLMUINT uiSeconds) { if( gv_XFlmSysData.pFileHdlCache) @@ -1963,7 +1963,7 @@ RCODE FLMAPI F_DbSystem::closeUnusedFiles( /**************************************************************************** Desc: Enable/disable cache debugging mode ****************************************************************************/ -void FLMAPI F_DbSystem::enableCacheDebug( +void XFLAPI F_DbSystem::enableCacheDebug( FLMBOOL bDebug) { #ifdef FLM_DEBUG @@ -1977,7 +1977,7 @@ void FLMAPI F_DbSystem::enableCacheDebug( /**************************************************************************** Desc: Returns cache debugging mode ****************************************************************************/ -FLMBOOL FLMAPI F_DbSystem::cacheDebugEnabled( void) +FLMBOOL XFLAPI F_DbSystem::cacheDebugEnabled( void) { #ifdef FLM_DEBUG return( gv_XFlmSysData.pBlockCacheMgr->m_bDebug || @@ -1990,7 +1990,7 @@ FLMBOOL FLMAPI F_DbSystem::cacheDebugEnabled( void) /**************************************************************************** Desc: Start gathering statistics. ****************************************************************************/ -void FLMAPI F_DbSystem::startStats( void) +void XFLAPI F_DbSystem::startStats( void) { f_mutexLock( gv_XFlmSysData.hStatsMutex); flmStatStart( &gv_XFlmSysData.Stats); @@ -2011,7 +2011,7 @@ void FLMAPI F_DbSystem::startStats( void) /**************************************************************************** Desc: Stop gathering statistics. ****************************************************************************/ -void FLMAPI F_DbSystem::stopStats( void) +void XFLAPI F_DbSystem::stopStats( void) { f_mutexLock( gv_XFlmSysData.hStatsMutex); flmStatStop( &gv_XFlmSysData.Stats); @@ -2036,7 +2036,7 @@ void FLMAPI F_DbSystem::stopStats( void) /**************************************************************************** Desc: Reset statistics. ****************************************************************************/ -void FLMAPI F_DbSystem::resetStats( void) +void XFLAPI F_DbSystem::resetStats( void) { FLMUINT uiSaveMax; @@ -2087,7 +2087,7 @@ void FLMAPI F_DbSystem::resetStats( void) Desc: Returns statistics that have been collected for a share. Notes: The statistics returned will be the statistics for ALL databases ****************************************************************************/ -RCODE FLMAPI F_DbSystem::getStats( +RCODE XFLAPI F_DbSystem::getStats( XFLM_STATS * pFlmStats) { RCODE rc = NE_XFLM_OK; @@ -2110,7 +2110,7 @@ Exit: /**************************************************************************** Desc: Frees memory allocated to a FLM_STATS structure ****************************************************************************/ -void FLMAPI F_DbSystem::freeStats( +void XFLAPI F_DbSystem::freeStats( XFLM_STATS * pFlmStats) { flmStatFree( pFlmStats); @@ -2121,7 +2121,7 @@ Desc: Sets the path for all temporary files that come into use within a FLAIM share structure. The share mutex should be locked when settting when called from FlmConfig(). ****************************************************************************/ -RCODE FLMAPI F_DbSystem::setTempDir( +RCODE XFLAPI F_DbSystem::setTempDir( const char * pszPath) { RCODE rc = NE_XFLM_OK; @@ -2147,7 +2147,7 @@ Exit: /**************************************************************************** Desc: Get the temporary directory. ****************************************************************************/ -RCODE FLMAPI F_DbSystem::getTempDir( +RCODE XFLAPI F_DbSystem::getTempDir( char * pszPath) { RCODE rc = NE_XFLM_OK; @@ -2174,7 +2174,7 @@ Exit: /**************************************************************************** Desc: Sets the maximum seconds between checkpoints ****************************************************************************/ -void FLMAPI F_DbSystem::setCheckpointInterval( +void XFLAPI F_DbSystem::setCheckpointInterval( FLMUINT uiSeconds) { gv_XFlmSysData.uiMaxCPInterval = FLM_SECS_TO_TIMER_UNITS( uiSeconds); @@ -2183,7 +2183,7 @@ void FLMAPI F_DbSystem::setCheckpointInterval( /**************************************************************************** Desc: Gets the maximum seconds between checkpoints ****************************************************************************/ -FLMUINT FLMAPI F_DbSystem::getCheckpointInterval( void) +FLMUINT XFLAPI F_DbSystem::getCheckpointInterval( void) { return( FLM_TIMER_UNITS_TO_SECS( gv_XFlmSysData.uiMaxCPInterval)); } @@ -2191,7 +2191,7 @@ FLMUINT FLMAPI F_DbSystem::getCheckpointInterval( void) /**************************************************************************** Desc: Sets the interval for dynamically adjusting the cache limit. ****************************************************************************/ -void FLMAPI F_DbSystem::setCacheAdjustInterval( +void XFLAPI F_DbSystem::setCacheAdjustInterval( FLMUINT uiSeconds) { gv_XFlmSysData.pGlobalCacheMgr->m_uiCacheAdjustInterval = @@ -2201,7 +2201,7 @@ void FLMAPI F_DbSystem::setCacheAdjustInterval( /**************************************************************************** Desc: Sets the interval for dynamically adjusting the cache limit. ****************************************************************************/ -FLMUINT FLMAPI F_DbSystem::getCacheAdjustInterval( void) +FLMUINT XFLAPI F_DbSystem::getCacheAdjustInterval( void) { return( FLM_TIMER_UNITS_TO_SECS( gv_XFlmSysData.pGlobalCacheMgr->m_uiCacheAdjustInterval)); @@ -2211,7 +2211,7 @@ FLMUINT FLMAPI F_DbSystem::getCacheAdjustInterval( void) Desc: Sets the interval for dynamically cleaning out old cache blocks and records ****************************************************************************/ -void FLMAPI F_DbSystem::setCacheCleanupInterval( +void XFLAPI F_DbSystem::setCacheCleanupInterval( FLMUINT uiSeconds) { gv_XFlmSysData.pGlobalCacheMgr->m_uiCacheCleanupInterval = @@ -2222,7 +2222,7 @@ void FLMAPI F_DbSystem::setCacheCleanupInterval( Desc: Gets the interval for dynamically cleaning out old cache blocks and records ****************************************************************************/ -FLMUINT FLMAPI F_DbSystem::getCacheCleanupInterval( void) +FLMUINT XFLAPI F_DbSystem::getCacheCleanupInterval( void) { return( FLM_TIMER_UNITS_TO_SECS( gv_XFlmSysData.pGlobalCacheMgr->m_uiCacheCleanupInterval)); @@ -2231,7 +2231,7 @@ FLMUINT FLMAPI F_DbSystem::getCacheCleanupInterval( void) /**************************************************************************** Desc: Set interval for cleaning up unused structures ****************************************************************************/ -void FLMAPI F_DbSystem::setUnusedCleanupInterval( +void XFLAPI F_DbSystem::setUnusedCleanupInterval( FLMUINT uiSeconds) { gv_XFlmSysData.pGlobalCacheMgr->m_uiUnusedCleanupInterval = @@ -2241,7 +2241,7 @@ void FLMAPI F_DbSystem::setUnusedCleanupInterval( /**************************************************************************** Desc: Gets the interval for cleaning up unused structures ****************************************************************************/ -FLMUINT FLMAPI F_DbSystem::getUnusedCleanupInterval( void) +FLMUINT XFLAPI F_DbSystem::getUnusedCleanupInterval( void) { return( FLM_TIMER_UNITS_TO_SECS( gv_XFlmSysData.pGlobalCacheMgr->m_uiUnusedCleanupInterval)); @@ -2251,7 +2251,7 @@ FLMUINT FLMAPI F_DbSystem::getUnusedCleanupInterval( void) Desc: Set the maximum time for an item to be unused before it is cleaned up ****************************************************************************/ -void FLMAPI F_DbSystem::setMaxUnusedTime( +void XFLAPI F_DbSystem::setMaxUnusedTime( FLMUINT uiSeconds) { gv_XFlmSysData.uiMaxUnusedTime = FLM_SECS_TO_TIMER_UNITS( uiSeconds); @@ -2260,7 +2260,7 @@ void FLMAPI F_DbSystem::setMaxUnusedTime( /**************************************************************************** Desc: Gets the maximum time for an item to be unused ****************************************************************************/ -FLMUINT FLMAPI F_DbSystem::getMaxUnusedTime( void) +FLMUINT XFLAPI F_DbSystem::getMaxUnusedTime( void) { return( FLM_TIMER_UNITS_TO_SECS( gv_XFlmSysData.uiMaxUnusedTime)); } @@ -2268,7 +2268,7 @@ FLMUINT FLMAPI F_DbSystem::getMaxUnusedTime( void) /**************************************************************************** Desc: Sets the logging object to be used for internal status messages ****************************************************************************/ -void FLMAPI F_DbSystem::setLogger( +void XFLAPI F_DbSystem::setLogger( IF_LoggerClient * pLogger) { IF_LoggerClient * pOldLogger = NULL; @@ -2322,7 +2322,7 @@ Desc: Deactivates open database handles, forcing the database to be Notes: Passing NULL for the path values will cause all active database handles to be deactivated ****************************************************************************/ -void FLMAPI F_DbSystem::deactivateOpenDb( +void XFLAPI F_DbSystem::deactivateOpenDb( const char * pszDbFileName, const char * pszDataDir) { @@ -2366,7 +2366,7 @@ void FLMAPI F_DbSystem::deactivateOpenDb( /**************************************************************************** Desc: Sets the maximum number of queries to save ****************************************************************************/ -void FLMAPI F_DbSystem::setQuerySaveMax( +void XFLAPI F_DbSystem::setQuerySaveMax( FLMUINT uiMaxToSave) { f_mutexLock( gv_XFlmSysData.hQueryMutex); @@ -2378,7 +2378,7 @@ void FLMAPI F_DbSystem::setQuerySaveMax( /**************************************************************************** Desc: Gets the maximum number of queries to save ****************************************************************************/ -FLMUINT FLMAPI F_DbSystem::getQuerySaveMax( void) +FLMUINT XFLAPI F_DbSystem::getQuerySaveMax( void) { return( gv_XFlmSysData.uiMaxQueries); } @@ -2386,7 +2386,7 @@ FLMUINT FLMAPI F_DbSystem::getQuerySaveMax( void) /**************************************************************************** Desc: Sets the maximum amount of dirty cache allowed ****************************************************************************/ -void FLMAPI F_DbSystem::setDirtyCacheLimits( +void XFLAPI F_DbSystem::setDirtyCacheLimits( FLMUINT uiMaxDirty, FLMUINT uiLowDirty) { @@ -2417,7 +2417,7 @@ void FLMAPI F_DbSystem::setDirtyCacheLimits( /**************************************************************************** Desc: Gets the maximum amount of dirty cache allowed ****************************************************************************/ -void FLMAPI F_DbSystem::getDirtyCacheLimits( +void XFLAPI F_DbSystem::getDirtyCacheLimits( FLMUINT * puiMaxDirty, FLMUINT * puiLowDirty) { @@ -2438,7 +2438,7 @@ void FLMAPI F_DbSystem::getDirtyCacheLimits( /**************************************************************************** Desc: Returns information about threads owned by the database engine ****************************************************************************/ -RCODE FLMAPI F_DbSystem::getThreadInfo( +RCODE XFLAPI F_DbSystem::getThreadInfo( IF_ThreadInfo ** ppThreadInfo) { return( FlmGetThreadInfo( ppThreadInfo)); @@ -2447,7 +2447,7 @@ RCODE FLMAPI F_DbSystem::getThreadInfo( /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_DbSystem::getFileSystem( +void XFLAPI F_DbSystem::getFileSystem( IF_FileSystem ** ppFileSystem) { FlmGetFileSystem( ppFileSystem); @@ -2456,7 +2456,7 @@ void FLMAPI F_DbSystem::getFileSystem( /**************************************************************************** Desc: Registers for an event ****************************************************************************/ -RCODE FLMAPI F_DbSystem::registerForEvent( +RCODE XFLAPI F_DbSystem::registerForEvent( eEventCategory eCategory, IF_EventClient * pEventClient) { @@ -2505,7 +2505,7 @@ Exit: /**************************************************************************** Desc: De-registers for an event ****************************************************************************/ -void FLMAPI F_DbSystem::deregisterForEvent( +void XFLAPI F_DbSystem::deregisterForEvent( eEventCategory eCategory, IF_EventClient * pEventClient) { @@ -2531,7 +2531,7 @@ void FLMAPI F_DbSystem::deregisterForEvent( Desc: Returns TRUE if the specified error indicates that the database is corrupt ****************************************************************************/ -RCODE FLMAPI F_DbSystem::getNextMetaphone( +RCODE XFLAPI F_DbSystem::getNextMetaphone( IF_IStream * pIStream, FLMUINT * puiMetaphone, FLMUINT * puiAltMetaphone) @@ -2544,7 +2544,7 @@ RCODE FLMAPI F_DbSystem::getNextMetaphone( Desc: Returns TRUE if the specified error indicates that the database is corrupt ****************************************************************************/ -FLMBOOL FLMAPI F_DbSystem::errorIsFileCorrupt( +FLMBOOL XFLAPI F_DbSystem::errorIsFileCorrupt( RCODE rc) { FLMBOOL bIsCorrupt = FALSE; @@ -2569,7 +2569,7 @@ FLMBOOL FLMAPI F_DbSystem::errorIsFileCorrupt( /**************************************************************************** Desc: Increment the database system use count ****************************************************************************/ -FLMINT FLMAPI F_DbSystem::AddRef( +FLMINT XFLAPI F_DbSystem::AddRef( FLMBOOL bSysDataLocked) { FLMINT iRefCnt; @@ -2593,7 +2593,7 @@ FLMINT FLMAPI F_DbSystem::AddRef( /**************************************************************************** Desc: Decrement the database system use count ****************************************************************************/ -FLMINT FLMAPI F_DbSystem::Release(void) +FLMINT XFLAPI F_DbSystem::Release(void) { FLMINT iRefCnt; @@ -2630,7 +2630,7 @@ FLMINT FLMAPI F_DbSystem::Release(void) /**************************************************************************** Desc: Allocates an F_DbSystem object for non-COM applications ****************************************************************************/ -FLMEXP RCODE FLMAPI FlmAllocDbSystem( +RCODE XFLAPI FlmAllocDbSystem( IF_DbSystem ** ppDbSystem) { RCODE rc = NE_XFLM_OK; @@ -2793,7 +2793,7 @@ Desc: Given a tag and a value this function will open/create the NOTE: This function expects gv_XFlmSysData.hIniMutex to already be locked! ****************************************************************************/ -RCODE FLMAPI F_DbSystem::updateIniFile( +RCODE XFLAPI F_DbSystem::updateIniFile( const char * pszParamName, const char * pszValue) { @@ -3203,7 +3203,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::openBufferIStream( +RCODE XFLAPI F_DbSystem::openBufferIStream( const char * pucBuffer, FLMUINT uiLength, IF_PosIStream ** ppIStream) @@ -3214,7 +3214,7 @@ RCODE FLMAPI F_DbSystem::openBufferIStream( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::openFileIStream( +RCODE XFLAPI F_DbSystem::openFileIStream( const char * pszPath, IF_PosIStream ** ppIStream) { @@ -3224,7 +3224,7 @@ RCODE FLMAPI F_DbSystem::openFileIStream( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::openMultiFileIStream( +RCODE XFLAPI F_DbSystem::openMultiFileIStream( const char * pszDirectory, const char * pszBaseName, IF_IStream ** ppIStream) @@ -3235,7 +3235,7 @@ RCODE FLMAPI F_DbSystem::openMultiFileIStream( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::openBufferedIStream( +RCODE XFLAPI F_DbSystem::openBufferedIStream( IF_IStream * pSourceIStream, FLMUINT uiBufferSize, IF_IStream ** ppIStream) @@ -3246,7 +3246,7 @@ RCODE FLMAPI F_DbSystem::openBufferedIStream( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::openUncompressingIStream( +RCODE XFLAPI F_DbSystem::openUncompressingIStream( IF_IStream * pIStream, IF_IStream ** ppIStream) { @@ -3256,7 +3256,7 @@ RCODE FLMAPI F_DbSystem::openUncompressingIStream( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::openFileOStream( +RCODE XFLAPI F_DbSystem::openFileOStream( const char * pszFileName, FLMBOOL bTruncateIfExists, IF_OStream ** ppOStream) @@ -3267,7 +3267,7 @@ RCODE FLMAPI F_DbSystem::openFileOStream( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::openMultiFileOStream( +RCODE XFLAPI F_DbSystem::openMultiFileOStream( const char * pszDirectory, const char * pszBaseName, FLMUINT uiMaxFileSize, @@ -3281,7 +3281,7 @@ RCODE FLMAPI F_DbSystem::openMultiFileOStream( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::removeMultiFileStream( +RCODE XFLAPI F_DbSystem::removeMultiFileStream( const char * pszDirectory, const char * pszBaseName) { @@ -3291,7 +3291,7 @@ RCODE FLMAPI F_DbSystem::removeMultiFileStream( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::openBufferedOStream( +RCODE XFLAPI F_DbSystem::openBufferedOStream( IF_OStream * pOStream, FLMUINT uiBufferSize, IF_OStream ** ppOStream) @@ -3302,7 +3302,7 @@ RCODE FLMAPI F_DbSystem::openBufferedOStream( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::openCompressingOStream( +RCODE XFLAPI F_DbSystem::openCompressingOStream( IF_OStream * pOStream, IF_OStream ** ppOStream) { @@ -3312,7 +3312,7 @@ RCODE FLMAPI F_DbSystem::openCompressingOStream( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::writeToOStream( +RCODE XFLAPI F_DbSystem::writeToOStream( IF_IStream * pIStream, IF_OStream * pOStream) { @@ -3322,7 +3322,7 @@ RCODE FLMAPI F_DbSystem::writeToOStream( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::openBase64Encoder( +RCODE XFLAPI F_DbSystem::openBase64Encoder( IF_IStream * pInputStream, FLMBOOL bInsertLineBreaks, IF_IStream ** ppEncodedStream) @@ -3334,7 +3334,7 @@ RCODE FLMAPI F_DbSystem::openBase64Encoder( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::openBase64Decoder( +RCODE XFLAPI F_DbSystem::openBase64Decoder( IF_IStream * pInputStream, IF_IStream ** ppDecodedStream) { @@ -3344,7 +3344,7 @@ RCODE FLMAPI F_DbSystem::openBase64Decoder( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::createIFResultSet( +RCODE XFLAPI F_DbSystem::createIFResultSet( IF_ResultSet ** ifppResultSet) { return( FlmAllocResultSet( ifppResultSet)); @@ -3353,7 +3353,7 @@ RCODE FLMAPI F_DbSystem::createIFResultSet( /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI F_DbSystem::uniIsUpper( +FLMBOOL XFLAPI F_DbSystem::uniIsUpper( FLMUNICODE uChar) { return( f_uniIsUpper( uChar)); @@ -3362,7 +3362,7 @@ FLMBOOL FLMAPI F_DbSystem::uniIsUpper( /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI F_DbSystem::uniIsLower( +FLMBOOL XFLAPI F_DbSystem::uniIsLower( FLMUNICODE uChar) { return( f_uniIsLower( uChar)); @@ -3371,7 +3371,7 @@ FLMBOOL FLMAPI F_DbSystem::uniIsLower( /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI F_DbSystem::uniIsAlpha( +FLMBOOL XFLAPI F_DbSystem::uniIsAlpha( FLMUNICODE uChar) { return( f_uniIsAlpha( uChar)); @@ -3380,7 +3380,7 @@ FLMBOOL FLMAPI F_DbSystem::uniIsAlpha( /**************************************************************************** Desc: ****************************************************************************/ -FLMBOOL FLMAPI F_DbSystem::uniIsDecimalDigit( +FLMBOOL XFLAPI F_DbSystem::uniIsDecimalDigit( FLMUNICODE uChar) { return( f_uniIsDecimalDigit( uChar)); @@ -3389,7 +3389,7 @@ FLMBOOL FLMAPI F_DbSystem::uniIsDecimalDigit( /**************************************************************************** Desc: ****************************************************************************/ -FLMUNICODE FLMAPI F_DbSystem::uniToLower( +FLMUNICODE XFLAPI F_DbSystem::uniToLower( FLMUNICODE uChar) { return( f_uniToLower( uChar)); @@ -3398,7 +3398,7 @@ FLMUNICODE FLMAPI F_DbSystem::uniToLower( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::nextUCS2Char( +RCODE XFLAPI F_DbSystem::nextUCS2Char( const FLMBYTE ** ppszUTF8, const FLMBYTE * pszEndOfUTF8String, FLMUNICODE * puzChar) @@ -3409,7 +3409,7 @@ RCODE FLMAPI F_DbSystem::nextUCS2Char( /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_DbSystem::numUCS2Chars( +RCODE XFLAPI F_DbSystem::numUCS2Chars( const FLMBYTE * pszUTF8, FLMUINT * puiNumChars) { @@ -3510,7 +3510,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_SuperFileClient::getFileNumber( +FLMUINT XFLAPI F_SuperFileClient::getFileNumber( FLMUINT uiBlockAddr) { return( FSGetFileNumber( uiBlockAddr)); @@ -3519,7 +3519,7 @@ FLMUINT FLMAPI F_SuperFileClient::getFileNumber( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_SuperFileClient::getFileOffset( +FLMUINT XFLAPI F_SuperFileClient::getFileOffset( FLMUINT uiBlockAddr) { return( FSGetFileOffset( uiBlockAddr)); @@ -3528,7 +3528,7 @@ FLMUINT FLMAPI F_SuperFileClient::getFileOffset( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT FLMAPI F_SuperFileClient::getBlockAddress( +FLMUINT XFLAPI F_SuperFileClient::getBlockAddress( FLMUINT uiFileNumber, FLMUINT uiFileOffset) { @@ -3538,7 +3538,7 @@ FLMUINT FLMAPI F_SuperFileClient::getBlockAddress( /**************************************************************************** Desc: ****************************************************************************/ -FLMUINT64 FLMAPI F_SuperFileClient::getMaxFileSize( void) +FLMUINT64 XFLAPI F_SuperFileClient::getMaxFileSize( void) { f_assert( m_uiMaxFileSize); return( m_uiMaxFileSize); @@ -3547,7 +3547,7 @@ FLMUINT64 FLMAPI F_SuperFileClient::getMaxFileSize( void) /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_SuperFileClient::getFilePath( +RCODE XFLAPI F_SuperFileClient::getFilePath( FLMUINT uiFileNumber, char * pszPath) { diff --git a/xflaim/src/fvector.cpp b/xflaim/src/fvector.cpp index d1193e8..f4903ae 100644 --- a/xflaim/src/fvector.cpp +++ b/xflaim/src/fvector.cpp @@ -66,7 +66,7 @@ Desc: Clear the data vector, but don't free any buffers that have been method is so that we can get efficient re-use of the vector. So, if it has allocated buffers, etc. we don't want to free them. ****************************************************************************/ -void FLMAPI F_DataVector::reset( void) +void XFLAPI F_DataVector::reset( void) { m_ui64DocumentID = 0; m_uiNumElements = 0; @@ -250,7 +250,7 @@ Exit: /**************************************************************************** Desc: Set the id for a vector element. ****************************************************************************/ -RCODE FLMAPI F_DataVector::setID( +RCODE XFLAPI F_DataVector::setID( FLMUINT uiElementNumber, FLMUINT64 ui64ID) { @@ -276,7 +276,7 @@ Exit: /**************************************************************************** Desc: Set the name id for a vector element. ****************************************************************************/ -RCODE FLMAPI F_DataVector::setNameId( +RCODE XFLAPI F_DataVector::setNameId( FLMUINT uiElementNumber, FLMUINT uiNameId, FLMBOOL bIsAttr, @@ -320,7 +320,7 @@ Exit: /**************************************************************************** Desc: Set a FLMINT value for a vector element. ****************************************************************************/ -RCODE FLMAPI F_DataVector::setINT( +RCODE XFLAPI F_DataVector::setINT( FLMUINT uiElementNumber, FLMINT iNum) { @@ -367,7 +367,7 @@ Exit: /**************************************************************************** Desc: Set a FLMINT64 value for a vector element. ****************************************************************************/ -RCODE FLMAPI F_DataVector::setINT64( +RCODE XFLAPI F_DataVector::setINT64( FLMUINT uiElementNumber, FLMINT64 i64Num) { @@ -403,7 +403,7 @@ Exit: /**************************************************************************** Desc: Set a FLMUINT value for a vector element. ****************************************************************************/ -RCODE FLMAPI F_DataVector::setUINT( +RCODE XFLAPI F_DataVector::setUINT( FLMUINT uiElementNumber, FLMUINT uiNum) { @@ -443,7 +443,7 @@ Exit: /**************************************************************************** Desc: Set a FLMUINT64 value for a vector element. ****************************************************************************/ -RCODE FLMAPI F_DataVector::setUINT64( +RCODE XFLAPI F_DataVector::setUINT64( FLMUINT uiElementNumber, FLMUINT64 ui64Num) { @@ -472,7 +472,7 @@ Exit: /**************************************************************************** Desc: Set a FLMUNICODE value for a vector element. ****************************************************************************/ -RCODE FLMAPI F_DataVector::setUnicode( +RCODE XFLAPI F_DataVector::setUnicode( FLMUINT uiElementNumber, const FLMUNICODE * puzUnicode) { @@ -544,7 +544,7 @@ Exit: /**************************************************************************** Desc: Set a UTF8 value for a vector element. ****************************************************************************/ -RCODE FLMAPI F_DataVector::setUTF8( +RCODE XFLAPI F_DataVector::setUTF8( FLMUINT uiElementNumber, const FLMBYTE * pszUTF8, FLMUINT uiBytesInBuffer) @@ -615,7 +615,7 @@ Exit: /**************************************************************************** Desc: Get a pointer to the UTF8 - no conversions are done. ****************************************************************************/ -RCODE FLMAPI F_DataVector::getUTF8Ptr( +RCODE XFLAPI F_DataVector::getUTF8Ptr( FLMUINT uiElementNumber, const FLMBYTE ** ppszUTF8, FLMUINT * puiBufLen) @@ -674,7 +674,7 @@ Exit: /**************************************************************************** Desc: Allocate data for a unicode element and retrieve it. ****************************************************************************/ -RCODE FLMAPI F_DataVector::getUnicode( +RCODE XFLAPI F_DataVector::getUnicode( FLMUINT uiElementNumber, FLMUNICODE ** ppuzUnicode) { @@ -719,7 +719,7 @@ Exit: /**************************************************************************** Desc: Compose a key buffer from the vector's components. ****************************************************************************/ -RCODE FLMAPI F_DataVector::outputKey( +RCODE XFLAPI F_DataVector::outputKey( IF_Db * ifpDb, FLMUINT uiIndexNum, FLMUINT, // uiMatchFlags, //VISIT: Need to remove this from the interface. @@ -1169,7 +1169,7 @@ Exit: /**************************************************************************** Desc: Populate a vector's components from the key part of an index key. ****************************************************************************/ -RCODE FLMAPI F_DataVector::inputKey( +RCODE XFLAPI F_DataVector::inputKey( IF_Db * ifpDb, FLMUINT uiIndexNum, const FLMBYTE * pucKey, @@ -1557,7 +1557,7 @@ Exit: /**************************************************************************** Desc: Compose a data buffer from the vector's components. ****************************************************************************/ -RCODE FLMAPI F_DataVector::outputData( +RCODE XFLAPI F_DataVector::outputData( IF_Db * ifpDb, FLMUINT uiIndexNum, FLMBYTE * pucDataBuf, @@ -1663,7 +1663,7 @@ Exit: /**************************************************************************** Desc: Populate a vector's data components from the data part of a key. ****************************************************************************/ -RCODE FLMAPI F_DataVector::inputData( +RCODE XFLAPI F_DataVector::inputData( IF_Db * ifpDb, FLMUINT uiIndexNum, const FLMBYTE * pucData, @@ -1783,7 +1783,7 @@ Exit: /**************************************************************************** Desc: Create and empty data vector and return it's interface... ****************************************************************************/ -RCODE FLMAPI F_DbSystem::createIFDataVector( +RCODE XFLAPI F_DbSystem::createIFDataVector( IF_DataVector ** ifppDV) { RCODE rc = NE_XFLM_OK; diff --git a/xflaim/src/fxml.cpp b/xflaim/src/fxml.cpp index 7ccdfce..544e5a7 100644 --- a/xflaim/src/fxml.cpp +++ b/xflaim/src/fxml.cpp @@ -6103,7 +6103,7 @@ Exit: Desc: Outputs a UTF8 stream of XML, starting at the specified node. Node and all of its descendant nodes are output. *****************************************************************************/ -RCODE FLMAPI F_Db::exportXML( +RCODE XFLAPI F_Db::exportXML( IF_DOMNode * pStartNode, IF_OStream * pOStream, eExportFormatType eFormatType) diff --git a/xflaim/src/fxpath.cpp b/xflaim/src/fxpath.cpp index 0f7bffc..023967b 100644 --- a/xflaim/src/fxpath.cpp +++ b/xflaim/src/fxpath.cpp @@ -1638,7 +1638,7 @@ public: { } - RCODE FLMAPI getValue( + RCODE XFLAPI getValue( IF_Db * pDb, IF_DOMNode * pContextNode, ValIterator eValueToGet, @@ -1647,7 +1647,7 @@ public: void * pvVal, F_DynaBuf * pDynaBuf = NULL); - RCODE FLMAPI cloneSelf( + RCODE XFLAPI cloneSelf( IF_QueryValFunc ** ppNewObj); }; @@ -1656,7 +1656,7 @@ Desc: Get the next value for a query function. Since this is really just code to test the callback, it always returns a value whose type is boolean and whose value is true. ****************************************************************************/ -RCODE FLMAPI XFLAIM_QueryValFunc::getValue( +RCODE XFLAPI XFLAIM_QueryValFunc::getValue( IF_Db *, // pDb, IF_DOMNode *, // pContextNode, ValIterator eValueToGet, @@ -1692,7 +1692,7 @@ Exit: /**************************************************************************** Desc: Copy self to create a new object. ****************************************************************************/ -RCODE FLMAPI XFLAIM_QueryValFunc::cloneSelf( +RCODE XFLAPI XFLAIM_QueryValFunc::cloneSelf( IF_QueryValFunc ** ppNewObj) { diff --git a/xflaim/src/nodeinfo.cpp b/xflaim/src/nodeinfo.cpp index 382a6ac..4b22afe 100644 --- a/xflaim/src/nodeinfo.cpp +++ b/xflaim/src/nodeinfo.cpp @@ -28,7 +28,7 @@ /***************************************************************************** Desc: Get node information and add it to the node information object. ******************************************************************************/ -RCODE FLMAPI F_NodeInfo::addNodeInfo( +RCODE XFLAPI F_NodeInfo::addNodeInfo( IF_Db * ifpDb, IF_DOMNode * pNode, FLMBOOL bDoNodeSubTree, @@ -224,7 +224,7 @@ Exit: /**************************************************************************** Desc: Create an empty node info. object and return it's interface... ****************************************************************************/ -RCODE FLMAPI F_DbSystem::createIFNodeInfo( +RCODE XFLAPI F_DbSystem::createIFNodeInfo( IF_NodeInfo ** ppNodeInfo) { RCODE rc = NE_XFLM_OK; diff --git a/xflaim/src/rfl.cpp b/xflaim/src/rfl.cpp index 5f6f258..486084e 100644 --- a/xflaim/src/rfl.cpp +++ b/xflaim/src/rfl.cpp @@ -71,7 +71,7 @@ public: } } - RCODE FLMAPI write( + RCODE XFLAPI write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten = NULL); @@ -79,7 +79,7 @@ public: RCODE write( IF_PosIStream * pIStream); - FINLINE RCODE FLMAPI closeStream( void) + FINLINE RCODE XFLAPI closeStream( void) { if( m_pRfl) { @@ -7289,7 +7289,7 @@ Exit: /******************************************************************** Desc: *********************************************************************/ -RCODE FLMAPI F_RflOStream::write( +RCODE XFLAPI F_RflOStream::write( const void * pvBuffer, FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten) @@ -9128,7 +9128,7 @@ Exit: /**************************************************************************** Desc: Returns the name of an RFL file given its number ****************************************************************************/ -void FLMAPI F_Db::getRflFileName( +void XFLAPI F_Db::getRflFileName( FLMUINT uiFileNum, FLMBOOL bBaseOnly, char * pszFileName, diff --git a/xflaim/src/scache.cpp b/xflaim/src/scache.cpp index 66491ad..12f49e4 100644 --- a/xflaim/src/scache.cpp +++ b/xflaim/src/scache.cpp @@ -62,7 +62,7 @@ FINLINE FLMINT scaCompare( Desc: Compare two cache blocks during a sort to determine which one has lower address. *****************************************************************************/ -FINLINE FLMINT FLMAPI scaSortCompare( +FINLINE FLMINT XFLAPI scaSortCompare( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -74,7 +74,7 @@ FINLINE FLMINT FLMAPI scaSortCompare( /*************************************************************************** Desc: Swap two entries in cache table during sort. *****************************************************************************/ -FINLINE void FLMAPI scaSortSwap( +FINLINE void XFLAPI scaSortSwap( void * pvBuffer, FLMUINT uiPos1, FLMUINT uiPos2) @@ -1830,7 +1830,7 @@ Exit: /**************************************************************************** Desc: This routine is called whenever a write of a dirty block completes. ****************************************************************************/ -FSTATIC void FLMAPI scaWriteComplete( +FSTATIC void XFLAPI scaWriteComplete( IF_IOBuffer * pIOBuffer, void * pvData) { @@ -7673,7 +7673,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -void FLMAPI F_CachedBlock::objectAllocInit( +void XFLAPI F_CachedBlock::objectAllocInit( void * pvAlloc, FLMUINT uiSize) { diff --git a/xflaim/src/translog.cpp b/xflaim/src/translog.cpp index d9b1dca..80e1930 100644 --- a/xflaim/src/translog.cpp +++ b/xflaim/src/translog.cpp @@ -25,7 +25,7 @@ #include "flaimsys.h" -FSTATIC void FLMAPI lgWriteComplete( +FSTATIC void XFLAPI lgWriteComplete( IF_IOBuffer * pIOBuffer, void * pvData); @@ -70,7 +70,7 @@ void scaLogWrite( Desc: This is the callback routine that is called when a disk write is completed. ****************************************************************************/ -FSTATIC void FLMAPI lgWriteComplete( +FSTATIC void XFLAPI lgWriteComplete( IF_IOBuffer * pIOBuffer, void * pvData) { diff --git a/xflaim/src/xflaim.h b/xflaim/src/xflaim.h index 8c78de1..db85b82 100644 --- a/xflaim/src/xflaim.h +++ b/xflaim/src/xflaim.h @@ -28,6 +28,29 @@ #include + // platform-specific API definitions for XFL* macros + #if defined( FLM_WIN) + #if defined( XFL_STATIC_LINK) + #define XFLEXP + #else + #if defined( XFL_SOURCE) + #define XFLEXP __declspec(dllexport) + #else + #define XFLEXP __declspec(dllimport) + #endif + #endif + #define XFLAPI __stdcall + #elif defined( FLM_NLM) + #define XFLEXP + #define XFLAPI __stdcall + #elif defined( FLM_UNIX) + #define XFLEXP + #define XFLAPI + #else + #error Platform not supported + #endif + #define XFLXPC extern "C" XFLEXP + #ifdef FLM_PACK_STRUCTS #pragma pack(push, 1) #endif @@ -1355,9 +1378,9 @@ * intermittently or throughout the life of the database system. The class id for * this interface is CLSID_F_DbSystemFactory and the interface id is IID_IF_DbSystem. */ - flminterface IF_DbSystem : public IF_Object + flminterface XFLEXP IF_DbSystem : public IF_Object { - virtual RCODE FLMAPI updateIniFile( + virtual RCODE XFLAPI updateIniFile( const char * pszParamName, const char * pszValue) = 0; @@ -1370,7 +1393,7 @@ * @param ppFileSystem A pointer to a file system object that can * be used to perform various operations on files. */ - virtual void FLMAPI getFileSystem( + virtual void XFLAPI getFileSystem( IF_FileSystem ** ppFileSystem) = 0; /** @@ -1404,7 +1427,7 @@ * @param ppDb A pointer to a database object that references the newly created database. * @return RCODE */ - virtual RCODE FLMAPI dbCreate( + virtual RCODE XFLAPI dbCreate( const char * pszDbFileName, const char * pszDataDir, const char * pszRflDir, @@ -1433,7 +1456,7 @@ * @param ppDb A pointer to a database object that references the newly created database. * @return RCODE */ - virtual RCODE FLMAPI dbOpen( + virtual RCODE XFLAPI dbOpen( const char * pszDbFileName, const char * pszDataDir, const char * pszRflDir, @@ -1485,7 +1508,7 @@ * @param pui64NodesDiscardedDocs The total number of documents that couldn't be recovered. * @return RCODE */ - virtual RCODE FLMAPI dbRebuild( + virtual RCODE XFLAPI dbRebuild( const char * pszSourceDbPath, const char * pszSourceDataDir, const char * pszDestDbPath, @@ -1526,7 +1549,7 @@ * a B-tree, number of keys, etc. Methods of the IF_DbInfo object provide for retrieval of this information. * @return RCODE */ - virtual RCODE FLMAPI dbCheck( + virtual RCODE XFLAPI dbCheck( const char * pszDbFileName, const char * pszDataDir, const char * pszRflDir, @@ -1572,7 +1595,7 @@ * methods of that interface. Those methods may be called by dbCopy to report copy progress. * @return RCODE */ - virtual RCODE FLMAPI dbCopy( + virtual RCODE XFLAPI dbCopy( const char * pszSrcDbName, const char * pszSrcDataDir, const char * pszSrcRflDir, @@ -1612,7 +1635,7 @@ * interface and implements the pure virtual methods of that interface. * @return RCODE */ - virtual RCODE FLMAPI dbRename( + virtual RCODE XFLAPI dbRename( const char * pszDbName, const char * pszDataDir, const char * pszRflDir, @@ -1640,7 +1663,7 @@ * @param bRemoveRflFiles A flag that indicate whether or not the RFL file(s) should be removed as well. * @return RCODE */ - virtual RCODE FLMAPI dbRemove( + virtual RCODE XFLAPI dbRemove( const char * pszDbName, const char * pszDataDir, const char * pszRflDir, @@ -1676,7 +1699,7 @@ * The application is responsible for implementing this object. * @return RCODE */ - virtual RCODE FLMAPI dbRestore( + virtual RCODE XFLAPI dbRestore( const char * pszDbPath, const char * pszDataDir, const char * pszRflDir, @@ -1709,7 +1732,7 @@ * @param ppDb A new database object. * @return RCODE */ - virtual RCODE FLMAPI dbDup( + virtual RCODE XFLAPI dbDup( IF_Db * pDb, IF_Db ** ppDb) = 0; @@ -1722,7 +1745,7 @@ * @param iErrCode The error code to be translated. * @return const char * */ - virtual const char * FLMAPI checkErrorToStr( + virtual const char * XFLAPI checkErrorToStr( FLMINT iCheckErrorCode) = 0; /** @@ -1737,7 +1760,7 @@ * @param ppIStream The input stream object used to read the data in. * @return RCODE */ - virtual RCODE FLMAPI openBufferIStream( + virtual RCODE XFLAPI openBufferIStream( const char * pucBuffer, FLMUINT uiLength, IF_PosIStream ** ppIStream) = 0; @@ -1753,7 +1776,7 @@ * @param ppIStream The input stream object used to read the data in. * @return RCODE */ - virtual RCODE FLMAPI openFileIStream( + virtual RCODE XFLAPI openFileIStream( const char * pszPath, IF_PosIStream ** ppIStream) = 0; @@ -1765,7 +1788,7 @@ * more files to read from. File names start with pszBaseName, then * pszBaseName.00000001, pszBaseName.00000002, etc. The extension is a hex number. */ - virtual RCODE FLMAPI openMultiFileIStream( + virtual RCODE XFLAPI openMultiFileIStream( const char * pszDirectory, const char * pszBaseName, IF_IStream ** ppIStream) = 0; @@ -1779,7 +1802,7 @@ * until pIStream has no more data to return. This method allows any input stream * to be turned into a buffered stream. */ - virtual RCODE FLMAPI openBufferedIStream( + virtual RCODE XFLAPI openBufferedIStream( IF_IStream * pIStream, FLMUINT uiBufferSize, IF_IStream ** ppIStream) = 0; @@ -1790,7 +1813,7 @@ * When (*ppIStream)->read() is called, it will read and uncompress data from * pIStream. */ - virtual RCODE FLMAPI openUncompressingIStream( + virtual RCODE XFLAPI openUncompressingIStream( IF_IStream * pIStream, IF_IStream ** ppIStream) = 0; @@ -1802,7 +1825,7 @@ * Data is written out to the specified file. The file may be created, overwritten, or * appended to, depending on iAccessFlags. */ - virtual RCODE FLMAPI openFileOStream( + virtual RCODE XFLAPI openFileOStream( const char * pszFileName, FLMBOOL bTruncateIfExists, IF_OStream ** ppOStream) = 0; @@ -1815,7 +1838,7 @@ * be created by appending a suffix with an incrementing HEX number. The * bOverwrite flag indicates whether to overwrite files that already exist. */ - virtual RCODE FLMAPI openMultiFileOStream( + virtual RCODE XFLAPI openMultiFileOStream( const char * pszDirectory, const char * pszBaseName, FLMUINT uiMaxFileSize, @@ -1825,7 +1848,7 @@ /** * @brief Remove a multi-file stream */ - virtual RCODE FLMAPI removeMultiFileStream( + virtual RCODE XFLAPI removeMultiFileStream( const char * pszDirectory, const char * pszBaseName) = 0; @@ -1835,7 +1858,7 @@ * As data is written to *ppOStream, it is buffered before ultimately being * written to pOStream. */ - virtual RCODE FLMAPI openBufferedOStream( + virtual RCODE XFLAPI openBufferedOStream( IF_OStream * pOStream, FLMUINT uiBufferSize, IF_OStream ** ppOStream) = 0; @@ -1846,7 +1869,7 @@ * As data is written to *ppOStream, it is compressed before ultimately being * written to pOStream. */ - virtual RCODE FLMAPI openCompressingOStream( + virtual RCODE XFLAPI openCompressingOStream( IF_OStream * pOStream, IF_OStream ** ppOStream) = 0; @@ -1854,7 +1877,7 @@ * @brief All data is read from the input stream (pIStream) and written * to the output stream (pOStream). This goes until pIStream returns EOF. */ - virtual RCODE FLMAPI writeToOStream( + virtual RCODE XFLAPI writeToOStream( IF_IStream * pIStream, IF_OStream * pOStream) = 0; @@ -1870,7 +1893,7 @@ * @param ppEncodedStream The stream object used to read the encoded data. * @return RCODE */ - virtual RCODE FLMAPI openBase64Encoder( + virtual RCODE XFLAPI openBase64Encoder( IF_IStream * pInputStream, FLMBOOL bInsertLineBreaks, IF_IStream ** ppEncodedStream) = 0; @@ -1885,7 +1908,7 @@ * @param ppDecodedStream The stream object used to read the decoded data. * @return RCODE */ - virtual RCODE FLMAPI openBase64Decoder( + virtual RCODE XFLAPI openBase64Decoder( IF_IStream * pInputStream, IF_IStream ** ppDecodedStream) = 0; @@ -1898,7 +1921,7 @@ * @param ifppDV The IF_DataVector object. * @return RCODE */ - virtual RCODE FLMAPI createIFDataVector( + virtual RCODE XFLAPI createIFDataVector( IF_DataVector ** ifppDV) = 0; /** @@ -1909,7 +1932,7 @@ * @param ifppResultSet The IF_ResultSet object. * @return RCODE */ - virtual RCODE FLMAPI createIFResultSet( + virtual RCODE XFLAPI createIFResultSet( IF_ResultSet ** ifppResultSet) = 0; /** @@ -1920,7 +1943,7 @@ * @param ifppQuery The IF_Query object. * @return RCODE */ - virtual RCODE FLMAPI createIFQuery( + virtual RCODE XFLAPI createIFQuery( IF_Query ** ifppQuery) = 0; /** @@ -1933,7 +1956,7 @@ * @param ppMem Pointer to the pointer of the memory to be freed. When the memory is * successfully freed, the pointer will be set to NULL */ - virtual void FLMAPI freeMem( + virtual void XFLAPI freeMem( void ** ppMem) = 0; // Various configuration routines @@ -1957,7 +1980,7 @@ * That calculated number becomes the effective maximum to adjust to. * @return RCODE */ - virtual RCODE FLMAPI setDynamicMemoryLimit( + virtual RCODE XFLAPI setDynamicMemoryLimit( FLMUINT uiCacheAdjustPercent, FLMUINT uiCacheAdjustMin, FLMUINT uiCacheAdjustMax, @@ -1993,7 +2016,7 @@ * starts up, rather than allow it to grow as needed. The default value to FALSE. * @return RCODE */ - virtual RCODE FLMAPI setHardMemoryLimit( + virtual RCODE XFLAPI setHardMemoryLimit( FLMUINT uiPercent, FLMBOOL bPercentOfAvail, FLMUINT uiMin, @@ -2009,7 +2032,7 @@ * * @return FLMBOOL TRUE=supported or FALSE=not supported. */ - virtual FLMBOOL FLMAPI getDynamicCacheSupported( void) = 0; + virtual FLMBOOL XFLAPI getDynamicCacheSupported( void) = 0; /** * @brief Query the database system for information regarding the current cache usage. @@ -2018,7 +2041,7 @@ * * @param pCacheInfo The cache info structure. */ - virtual void FLMAPI getCacheInfo( + virtual void XFLAPI getCacheInfo( XFLM_CACHE_INFO * pCacheInfo) = 0; /** @@ -2029,7 +2052,7 @@ * * @param bDebug A boolean to indicate whether to enable or disable cache debug mode. */ - virtual void FLMAPI enableCacheDebug( + virtual void XFLAPI enableCacheDebug( FLMBOOL bDebug) = 0; /** @@ -2039,7 +2062,7 @@ * * @return FLMBOOL True or False */ - virtual FLMBOOL FLMAPI cacheDebugEnabled( void) = 0; + virtual FLMBOOL XFLAPI cacheDebugEnabled( void) = 0; /** * @brief Close all file handles (descriptors) that have not been used for a specified @@ -2054,7 +2077,7 @@ * (descriptors), regardless of how long they have been unused. * @return RCODE */ - virtual RCODE FLMAPI closeUnusedFiles( + virtual RCODE XFLAPI closeUnusedFiles( FLMUINT uiSeconds) = 0; /** @@ -2062,21 +2085,21 @@ * * This method starts the collection of statistics on the database system. */ - virtual void FLMAPI startStats( void) = 0; + virtual void XFLAPI startStats( void) = 0; /** * @brief Stop the collection of statistics on the database system. * * This method stops the collection of statistics on the database system. */ - virtual void FLMAPI stopStats( void) = 0; + virtual void XFLAPI stopStats( void) = 0; /** * @brief Reset the statistics counters on the database system. * * This method resets the statistics counters on the database system. */ - virtual void FLMAPI resetStats( void) = 0; + virtual void XFLAPI resetStats( void) = 0; /** * @brief Retrieve the statistics from the database system. @@ -2086,7 +2109,7 @@ * @param pFlmStats The structure where statistics are returned. * @return RCODE */ - virtual RCODE FLMAPI getStats( + virtual RCODE XFLAPI getStats( XFLM_STATS * pFlmStats) = 0; /** @@ -2098,7 +2121,7 @@ * * @param pFlmStats The statistics structure whose memory allocations are to be freed. */ - virtual void FLMAPI freeStats( + virtual void XFLAPI freeStats( XFLM_STATS * pFlmStats) = 0; /** @@ -2109,7 +2132,7 @@ * @param pszPath The temporary directory path. * @return RCODE */ - virtual RCODE FLMAPI setTempDir( + virtual RCODE XFLAPI setTempDir( const char * pszPath) = 0; /** @@ -2121,7 +2144,7 @@ * @param pszPath The temporary directory path is returned here. * @return RCODE */ - virtual RCODE FLMAPI getTempDir( + virtual RCODE XFLAPI getTempDir( char * pszPath) = 0; /** @@ -2158,7 +2181,7 @@ * active. If an update transaction is active and runs for a long time, the time * between completed checkpoints could exceed the time specified in this method. */ - virtual void FLMAPI setCheckpointInterval( + virtual void XFLAPI setCheckpointInterval( FLMUINT uiSeconds) = 0; /** @@ -2167,7 +2190,7 @@ * This method returns the current checkpoint interval. * @return FLMUINT The current checkpoint interval (seconds). */ - virtual FLMUINT FLMAPI getCheckpointInterval( void) = 0; + virtual FLMUINT XFLAPI getCheckpointInterval( void) = 0; /** * @brief Set the time interval for dynamically adjusting the cache limit. @@ -2176,7 +2199,7 @@ * * @param uiSeconds The time interval for dynamically adjusting the cache limit. */ - virtual void FLMAPI setCacheAdjustInterval( + virtual void XFLAPI setCacheAdjustInterval( FLMUINT uiSeconds) = 0; /** @@ -2186,7 +2209,7 @@ * * @return FLMUINT The curernt cache adjust interval (seconds). */ - virtual FLMUINT FLMAPI getCacheAdjustInterval( void) = 0; + virtual FLMUINT XFLAPI getCacheAdjustInterval( void) = 0; /** * @brief Set the time interval for dynamically cleaning out old cache blocks from block cache. @@ -2195,7 +2218,7 @@ * * @param uiSeconds The time interval for dynamically cleaning out old cache blocks. */ - virtual void FLMAPI setCacheCleanupInterval( + virtual void XFLAPI setCacheCleanupInterval( FLMUINT uiSeconds) = 0; /** @@ -2205,7 +2228,7 @@ * * @return FLMUINT The current cache cleanup inerval (seconds). */ - virtual FLMUINT FLMAPI getCacheCleanupInterval( void) = 0; + virtual FLMUINT XFLAPI getCacheCleanupInterval( void) = 0; /** * @brief Set time interval for cleaning up unused resources (such as file handles). @@ -2214,7 +2237,7 @@ * * @param uiSeconds The time interval for cleaning up unused resources (such as file handles). */ - virtual void FLMAPI setUnusedCleanupInterval( + virtual void XFLAPI setUnusedCleanupInterval( FLMUINT uiSeconds) = 0; /** @@ -2224,7 +2247,7 @@ * * @return FLMUINT The current unused cleanup interval (seconds). */ - virtual FLMUINT FLMAPI getUnusedCleanupInterval( void) = 0; + virtual FLMUINT XFLAPI getUnusedCleanupInterval( void) = 0; /** * @brief Set maximum time for a resource (such as a file handle) to be unused before it is cleaned up. @@ -2235,7 +2258,7 @@ * @param uiSeconds The maximum time for a resource (such as a file handle) to be unused before it is * cleaned up. */ - virtual void FLMAPI setMaxUnusedTime( + virtual void XFLAPI setMaxUnusedTime( FLMUINT uiSeconds) = 0; /** @@ -2246,14 +2269,14 @@ * * @return FLMUINT The current maximum unused time (seconds). */ - virtual FLMUINT FLMAPI getMaxUnusedTime( void) = 0; + virtual FLMUINT XFLAPI getMaxUnusedTime( void) = 0; /** * @brief Set the logger client. * * @param pLogger Pointer to the logger client object. */ - virtual void FLMAPI setLogger( + virtual void XFLAPI setLogger( IF_LoggerClient * pLogger) = 0; /** @@ -2272,7 +2295,7 @@ * (as specified by the pszDbFileName parameter). See the XFlaim Concepts/Database Files for * a discussion on the different database files. */ - virtual void FLMAPI deactivateOpenDb( + virtual void XFLAPI deactivateOpenDb( const char * pszDatabasePath, const char * pszDataFilePath) = 0; @@ -2283,7 +2306,7 @@ * * @param uiMaxToSave The maximum number of queries to save. */ - virtual void FLMAPI setQuerySaveMax( + virtual void XFLAPI setQuerySaveMax( FLMUINT uiMaxToSave) = 0; /** @@ -2293,7 +2316,7 @@ * * @return FLMUINT The maximum number of queries to save. */ - virtual FLMUINT FLMAPI getQuerySaveMax( void) = 0; + virtual FLMUINT XFLAPI getQuerySaveMax( void) = 0; /** * @brief Set the minimum and maximum dirty cache limits. @@ -2324,7 +2347,7 @@ * @param uiMaxDirty The maximum amount (in bytes) of dirty cache allowed. * @param uiLowDirty The low threshold (in bytes) for dirty cache. */ - virtual void FLMAPI setDirtyCacheLimits( + virtual void XFLAPI setDirtyCacheLimits( FLMUINT uiMaxDirty, FLMUINT uiLowDirty) = 0; @@ -2336,7 +2359,7 @@ * @param puiMaxDirty The maximum number of dirty blocks allowed in the cache. * @param puiLowDirty The low threshold for the number of dirty blocks in cache. */ - virtual void FLMAPI getDirtyCacheLimits( + virtual void XFLAPI getDirtyCacheLimits( FLMUINT * puiMaxDirty, FLMUINT * puiLowDirty) = 0; @@ -2351,7 +2374,7 @@ * * @return RCODE */ - virtual RCODE FLMAPI getThreadInfo( + virtual RCODE XFLAPI getThreadInfo( IF_ThreadInfo ** ifppThreadInfo) = 0; /** @@ -2364,7 +2387,7 @@ * * @return RCODE */ - virtual RCODE FLMAPI registerForEvent( + virtual RCODE XFLAPI registerForEvent( eEventCategory eCategory, IF_EventClient * ifpEventClient) = 0; @@ -2380,7 +2403,7 @@ * registered for an event, XFlaim can know exactly which object to * deregister. */ - virtual void FLMAPI deregisterForEvent( + virtual void XFLAPI deregisterForEvent( eEventCategory eCategory, IF_EventClient * ifpEventClient) = 0; @@ -2397,7 +2420,7 @@ * * @return RCODE */ - virtual RCODE FLMAPI getNextMetaphone( + virtual RCODE XFLAPI getNextMetaphone( IF_IStream * ifpIStream, FLMUINT * puiMetaphone, FLMUINT * puiAltMetaphone = NULL) = 0; @@ -2405,7 +2428,7 @@ /** * @brief Compares two UTF-8 strings */ - virtual RCODE FLMAPI compareUTF8Strings( + virtual RCODE XFLAPI compareUTF8Strings( const FLMBYTE * pucLString, FLMUINT uiLStrBytes, FLMBOOL bLeftWild, @@ -2419,7 +2442,7 @@ /** * @brief Compares two Unicode strings */ - virtual RCODE FLMAPI compareUnicodeStrings( + virtual RCODE XFLAPI compareUnicodeStrings( const FLMUNICODE * puzLString, FLMUINT uiLStrBytes, FLMBOOL bLeftWild, @@ -2430,26 +2453,26 @@ FLMUINT uiLanguage, FLMINT * piResult) = 0; - virtual RCODE FLMAPI utf8IsSubStr( + virtual RCODE XFLAPI utf8IsSubStr( const FLMBYTE * pszString, const FLMBYTE * pszSubString, FLMUINT uiCompareRules, FLMUINT uiLanguage, FLMBOOL * pbExists) = 0; - virtual FLMBOOL FLMAPI uniIsUpper( + virtual FLMBOOL XFLAPI uniIsUpper( FLMUNICODE uzChar) = 0; - virtual FLMBOOL FLMAPI uniIsLower( + virtual FLMBOOL XFLAPI uniIsLower( FLMUNICODE uzChar) = 0; - virtual FLMBOOL FLMAPI uniIsAlpha( + virtual FLMBOOL XFLAPI uniIsAlpha( FLMUNICODE uzChar) = 0; - virtual FLMBOOL FLMAPI uniIsDecimalDigit( + virtual FLMBOOL XFLAPI uniIsDecimalDigit( FLMUNICODE uzChar) = 0; - virtual FLMUNICODE FLMAPI uniToLower( + virtual FLMUNICODE XFLAPI uniToLower( FLMUNICODE uzChar) = 0; // When the nextUCS2Char method is called, the UCS-2 version of the character @@ -2459,12 +2482,12 @@ // Note: Remember to keep a copy of the pointer to the start of the // string, because whatever is passed in as ppszUTF8 will be modified. - virtual RCODE FLMAPI nextUCS2Char( + virtual RCODE XFLAPI nextUCS2Char( const FLMBYTE ** ppszUTF8, const FLMBYTE * pszEndOfUTF8String, FLMUNICODE * puzChar) = 0; - virtual RCODE FLMAPI numUCS2Chars( + virtual RCODE XFLAPI numUCS2Chars( const FLMBYTE * pszUTF8, FLMUINT * puiNumChars) = 0; @@ -2476,7 +2499,7 @@ * * @return RCODE */ - virtual RCODE FLMAPI waitToClose( + virtual RCODE XFLAPI waitToClose( const char * pszDbFileName) = 0; /** @@ -2487,7 +2510,7 @@ * @param ifppNodeInfo The IF_NodeInfo object. * @return RCODE */ - virtual RCODE FLMAPI createIFNodeInfo( + virtual RCODE XFLAPI createIFNodeInfo( IF_NodeInfo ** ifppNodeInfo) = 0; /** @@ -2498,7 +2521,7 @@ * @param ifppBTreeInfo The IF_BTreeInfo object. * @return RCODE */ - virtual RCODE FLMAPI createIFBTreeInfo( + virtual RCODE XFLAPI createIFBTreeInfo( IF_BTreeInfo ** ifppBTreeInfo) = 0; /** @@ -2511,7 +2534,7 @@ * * @return RCODE */ - virtual RCODE FLMAPI clearCache( + virtual RCODE XFLAPI clearCache( IF_Db * pDb) = 0; }; @@ -2525,45 +2548,45 @@ XFLM_EXPORT_INDENT_DATA = 0x03 // Indent Data - this changes the data } eExportFormatType; - FLMEXP RCODE FLMAPI FlmAllocDbSystem( + XFLXPC RCODE XFLAPI FlmAllocDbSystem( IF_DbSystem ** ppDbSystem); /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_Db : public F_Object + flminterface XFLEXP IF_Db : public F_Object { - virtual RCODE FLMAPI transBegin( + virtual RCODE XFLAPI transBegin( eDbTransType eTransType, FLMUINT uiMaxLockWait = FLM_NO_TIMEOUT, FLMUINT uiFlags = 0, XFLM_DB_HDR * pDbHeader = NULL) = 0; - virtual RCODE FLMAPI transBegin( + virtual RCODE XFLAPI transBegin( IF_Db * pDb) = 0; - virtual RCODE FLMAPI transCommit( + virtual RCODE XFLAPI transCommit( FLMBOOL * pbEmpty = NULL) = 0; - virtual RCODE FLMAPI transAbort( void) = 0; + virtual RCODE XFLAPI transAbort( void) = 0; - virtual eDbTransType FLMAPI getTransType( void) = 0; + virtual eDbTransType XFLAPI getTransType( void) = 0; - virtual RCODE FLMAPI doCheckpoint( + virtual RCODE XFLAPI doCheckpoint( FLMUINT uiTimeout) = 0; - virtual RCODE FLMAPI dbLock( + virtual RCODE XFLAPI dbLock( eLockType lockType, FLMINT iPriority, FLMUINT uiTimeout) = 0; - virtual RCODE FLMAPI dbUnlock( void) = 0; + virtual RCODE XFLAPI dbUnlock( void) = 0; - virtual RCODE FLMAPI getLockType( + virtual RCODE XFLAPI getLockType( eLockType * pLockType, FLMBOOL * pbImplicit) = 0; - virtual RCODE FLMAPI getLockInfo( + virtual RCODE XFLAPI getLockInfo( FLMINT iPriority, eLockType * pCurrLockType, FLMUINT * puiThreadId, @@ -2571,204 +2594,204 @@ FLMUINT * puiNumSharedQueued, FLMUINT * puiPriorityCount) = 0; - virtual RCODE FLMAPI indexStatus( + virtual RCODE XFLAPI indexStatus( FLMUINT uiIndexNum, XFLM_INDEX_STATUS * pIndexStatus) = 0; - virtual RCODE FLMAPI indexGetNext( + virtual RCODE XFLAPI indexGetNext( FLMUINT * puiIndexNum) = 0; - virtual RCODE FLMAPI indexSuspend( + virtual RCODE XFLAPI indexSuspend( FLMUINT uiIndexNum) = 0; - virtual RCODE FLMAPI indexResume( + virtual RCODE XFLAPI indexResume( FLMUINT uiIndexNum) = 0; - virtual RCODE FLMAPI keyRetrieve( + virtual RCODE XFLAPI keyRetrieve( FLMUINT uiIndex, IF_DataVector * pSearchKey, FLMUINT uiFlags, IF_DataVector * pFoundKey) = 0; - virtual RCODE FLMAPI enableEncryption( void) = 0; + virtual RCODE XFLAPI enableEncryption( void) = 0; - virtual RCODE FLMAPI wrapKey( + virtual RCODE XFLAPI wrapKey( const char * pszPassword = NULL) = 0; - virtual RCODE FLMAPI rollOverDbKey( void) = 0; + virtual RCODE XFLAPI rollOverDbKey( void) = 0; - virtual RCODE FLMAPI changeItemState( + virtual RCODE XFLAPI changeItemState( FLMUINT uiDictType, FLMUINT uiDictNum, const char * pszState) = 0; - virtual RCODE FLMAPI reduceSize( + virtual RCODE XFLAPI reduceSize( FLMUINT uiCount, FLMUINT * puiCount) = 0; - virtual RCODE FLMAPI upgrade( + virtual RCODE XFLAPI upgrade( IF_UpgradeClient * pUpgradeClient) = 0; - virtual RCODE FLMAPI createRootElement( + virtual RCODE XFLAPI createRootElement( FLMUINT uiCollection, FLMUINT uiNameId, IF_DOMNode ** ppElementNode, FLMUINT64 * pui64NodeId = NULL) = 0; - virtual RCODE FLMAPI createDocument( + virtual RCODE XFLAPI createDocument( FLMUINT uiCollection, IF_DOMNode ** ppDocumentNode, FLMUINT64 * pui64NodeId = NULL) = 0; - virtual RCODE FLMAPI getFirstDocument( + virtual RCODE XFLAPI getFirstDocument( FLMUINT uiCollection, IF_DOMNode ** ppDocumentNode) = 0; - virtual RCODE FLMAPI getLastDocument( + virtual RCODE XFLAPI getLastDocument( FLMUINT uiCollection, IF_DOMNode ** ppDocumentNode) = 0; - virtual RCODE FLMAPI getDocument( + virtual RCODE XFLAPI getDocument( FLMUINT uiCollection, FLMUINT uiFlags, FLMUINT64 ui64DocumentId, IF_DOMNode ** ppDocumentNode) = 0; - virtual RCODE FLMAPI documentDone( + virtual RCODE XFLAPI documentDone( FLMUINT uiCollection, FLMUINT64 ui64RootId) = 0; - virtual RCODE FLMAPI documentDone( + virtual RCODE XFLAPI documentDone( IF_DOMNode * pDocNode) = 0; - virtual RCODE FLMAPI createElementDef( + virtual RCODE XFLAPI createElementDef( const char * pszNamespaceURI, const char * pszElementName, FLMUINT uiDataType, FLMUINT * puiElementNameId = NULL, IF_DOMNode ** ppDocumentNode = NULL) = 0; - virtual RCODE FLMAPI createElementDef( + virtual RCODE XFLAPI createElementDef( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzElementName, FLMUINT uiDataType, FLMUINT * puiElementNameId = NULL, IF_DOMNode ** ppDocumentNode = NULL) = 0; - virtual RCODE FLMAPI createUniqueElmDef( + virtual RCODE XFLAPI createUniqueElmDef( const char * pszNamespaceURI, const char * pszElementName, FLMUINT * puiElementNameId = NULL, IF_DOMNode ** ppDocumentNode = NULL) = 0; - virtual RCODE FLMAPI createUniqueElmDef( + virtual RCODE XFLAPI createUniqueElmDef( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzElementName, FLMUINT * puiElementNameId = NULL, IF_DOMNode ** ppDocumentNode = NULL) = 0; - virtual RCODE FLMAPI getElementNameId( + virtual RCODE XFLAPI getElementNameId( const char * pszNamespaceURI, const char * pszElementName, FLMUINT * puiElementNameId) = 0; - virtual RCODE FLMAPI getElementNameId( + virtual RCODE XFLAPI getElementNameId( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzElementName, FLMUINT * puiElementNameId) = 0; - virtual RCODE FLMAPI createAttributeDef( + virtual RCODE XFLAPI createAttributeDef( const char * pszNamespaceURI, const char * pszAttributeName, FLMUINT uiDataType, FLMUINT * puiAttributeNameId, IF_DOMNode ** ppDocumentNode = NULL) = 0; - virtual RCODE FLMAPI createAttributeDef( + virtual RCODE XFLAPI createAttributeDef( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzAttributeName, FLMUINT uiDataType, FLMUINT * puiAttributeNameId, IF_DOMNode ** ppDocumentNode = NULL) = 0; - virtual RCODE FLMAPI getAttributeNameId( + virtual RCODE XFLAPI getAttributeNameId( const char * pszNamespaceURI, const char * pszAttributeName, FLMUINT * puiAttributeNameId) = 0; - virtual RCODE FLMAPI getAttributeNameId( + virtual RCODE XFLAPI getAttributeNameId( const FLMUNICODE * puzNamespaceURI, const FLMUNICODE * puzAttributeName, FLMUINT * puiAttributeNameId) = 0; - virtual RCODE FLMAPI createPrefixDef( + virtual RCODE XFLAPI createPrefixDef( const char * pszPrefixName, FLMUINT * puiPrefixNumber) = 0; - virtual RCODE FLMAPI createPrefixDef( + virtual RCODE XFLAPI createPrefixDef( const FLMUNICODE * puzPrefixName, FLMUINT * puiPrefixNumber) = 0; - virtual RCODE FLMAPI getPrefixId( + virtual RCODE XFLAPI getPrefixId( const char * pszPrefixName, FLMUINT * puiPrefixNumber) = 0; - virtual RCODE FLMAPI getPrefixId( + virtual RCODE XFLAPI getPrefixId( const FLMUNICODE * puzPrefixName, FLMUINT * puiPrefixNumber) = 0; - virtual RCODE FLMAPI createEncDef( + virtual RCODE XFLAPI createEncDef( const char * pszEncType, const char * pszEncName, FLMUINT uiKeySize, FLMUINT * puiEncDefNumber) = 0; - virtual RCODE FLMAPI createEncDef( + virtual RCODE XFLAPI createEncDef( const FLMUNICODE * puzEncType, const FLMUNICODE * puzEncName, FLMUINT uiKeySize, FLMUINT * puiEncDefNumber) = 0; - virtual RCODE FLMAPI getEncDefId( + virtual RCODE XFLAPI getEncDefId( const char * pszEncDefName, FLMUINT * puiPrefixNumber) = 0; - virtual RCODE FLMAPI getEncDefId( + virtual RCODE XFLAPI getEncDefId( const FLMUNICODE * puzEncDefName, FLMUINT * puiEncDefNumber) = 0; - virtual RCODE FLMAPI createCollectionDef( + virtual RCODE XFLAPI createCollectionDef( const char * pszCollectionName, FLMUINT * puiCollectionNumber, FLMUINT uiEncNumber = 0) = 0; - virtual RCODE FLMAPI createCollectionDef( + virtual RCODE XFLAPI createCollectionDef( const FLMUNICODE * puzCollectionName, FLMUINT * puiCollectionNumber, FLMUINT uiEncNumber = 0) = 0; - virtual RCODE FLMAPI getCollectionNumber( + virtual RCODE XFLAPI getCollectionNumber( const char * pszCollectionName, FLMUINT * puiCollectionNumber) = 0; - virtual RCODE FLMAPI getCollectionNumber( + virtual RCODE XFLAPI getCollectionNumber( const FLMUNICODE * puzCollectionName, FLMUINT * puiCollectionNumber) = 0; - virtual RCODE FLMAPI getIndexNumber( + virtual RCODE XFLAPI getIndexNumber( const char * pszIndexName, FLMUINT * puiIndexNumber) = 0; - virtual RCODE FLMAPI getIndexNumber( + virtual RCODE XFLAPI getIndexNumber( const FLMUNICODE * puzIndexName, FLMUINT * puiIndexNumber) = 0; - virtual RCODE FLMAPI getDictionaryDef( + virtual RCODE XFLAPI getDictionaryDef( FLMUINT uiDictType, FLMUINT uiDictNumber, IF_DOMNode ** ppDocumentNode) = 0; - virtual RCODE FLMAPI getDictionaryName( + virtual RCODE XFLAPI getDictionaryName( FLMUINT uiDictType, FLMUINT uiDictNumber, char * pszName, @@ -2776,7 +2799,7 @@ char * pszNamespace = NULL, FLMUINT * puiNamespaceBufSize = NULL) = 0; - virtual RCODE FLMAPI getDictionaryName( + virtual RCODE XFLAPI getDictionaryName( FLMUINT uiDictType, FLMUINT uiDictNumber, FLMUNICODE * puzName, @@ -2784,176 +2807,176 @@ FLMUNICODE * puzNamespace = NULL, FLMUINT * puiNamespaceBufSize = NULL) = 0; - virtual RCODE FLMAPI getNode( + virtual RCODE XFLAPI getNode( FLMUINT uiCollection, FLMUINT64 ui64NodeId, IF_DOMNode ** ppNode) = 0; - virtual RCODE FLMAPI getAttribute( + virtual RCODE XFLAPI getAttribute( FLMUINT uiCollection, FLMUINT64 ui64ElementNodeId, FLMUINT uiAttrNameId, IF_DOMNode ** ppNode) = 0; - virtual RCODE FLMAPI getDataType( + virtual RCODE XFLAPI getDataType( FLMUINT uiDictType, FLMUINT uiNameId, FLMUINT * puiDataType) = 0; - virtual RCODE FLMAPI backupBegin( + virtual RCODE XFLAPI backupBegin( eDbBackupType eBackupType, eDbTransType eTransType, FLMUINT uiMaxLockWait, IF_Backup ** ppBackup) = 0; - virtual void FLMAPI getRflFileName( + virtual void XFLAPI getRflFileName( FLMUINT uiFileNum, FLMBOOL bBaseOnly, char * pszFileName, FLMUINT * puiFileNameBufSize, FLMBOOL * pbNameTruncated = NULL) = 0; - virtual RCODE FLMAPI import( + virtual RCODE XFLAPI import( IF_IStream * pIStream, FLMUINT uiCollection, IF_DOMNode * pNodeToLinkTo = NULL, eNodeInsertLoc eInsertLoc = XFLM_LAST_CHILD, XFLM_IMPORT_STATS * pImportStats = NULL) = 0; - virtual RCODE FLMAPI importDocument( + virtual RCODE XFLAPI importDocument( IF_IStream * ifpStream, FLMUINT uiCollection, IF_DOMNode ** ppDocumentNode = NULL, XFLM_IMPORT_STATS * pImportStats = NULL) = 0; - virtual RCODE FLMAPI exportXML( + virtual RCODE XFLAPI exportXML( IF_DOMNode * pStartNode, IF_OStream * pOStream, eExportFormatType eFormat = XFLM_EXPORT_INDENT) = 0; - virtual RCODE FLMAPI setNextNodeId( + virtual RCODE XFLAPI setNextNodeId( FLMUINT uiCollection, FLMUINT64 ui64NextNodeId) = 0; - virtual RCODE FLMAPI setNextDictNum( + virtual RCODE XFLAPI setNextDictNum( FLMUINT uiDictType, FLMUINT uiDictNumber) = 0; // Configuration "set" and "get" methods - virtual RCODE FLMAPI setRflKeepFilesFlag( + virtual RCODE XFLAPI setRflKeepFilesFlag( FLMBOOL bKeep) = 0; - virtual RCODE FLMAPI getRflKeepFlag( + virtual RCODE XFLAPI getRflKeepFlag( FLMBOOL * pbKeep) = 0; - virtual RCODE FLMAPI setRflDir( + virtual RCODE XFLAPI setRflDir( const char * pszNewRflDir) = 0; - virtual void FLMAPI getRflDir( + virtual void XFLAPI getRflDir( char * pszRflDir) = 0; - virtual RCODE FLMAPI getRflFileNum( + virtual RCODE XFLAPI getRflFileNum( FLMUINT * puiRflFileNum) = 0; - virtual RCODE FLMAPI getHighestNotUsedRflFileNum( + virtual RCODE XFLAPI getHighestNotUsedRflFileNum( FLMUINT * puiHighestNotUsedRflFileNum) = 0; - virtual RCODE FLMAPI setRflFileSizeLimits( + virtual RCODE XFLAPI setRflFileSizeLimits( FLMUINT uiMinRflSize, FLMUINT uiMaxRflSize) = 0; - virtual RCODE FLMAPI getRflFileSizeLimits( + virtual RCODE XFLAPI getRflFileSizeLimits( FLMUINT * puiRflMinFileSize, FLMUINT * puiRflMaxFileSize) = 0; - virtual RCODE FLMAPI rflRollToNextFile( void) = 0; + virtual RCODE XFLAPI rflRollToNextFile( void) = 0; - virtual RCODE FLMAPI setKeepAbortedTransInRflFlag( + virtual RCODE XFLAPI setKeepAbortedTransInRflFlag( FLMBOOL bKeep) = 0; - virtual RCODE FLMAPI getKeepAbortedTransInRflFlag( + virtual RCODE XFLAPI getKeepAbortedTransInRflFlag( FLMBOOL * pbKeep) = 0; - virtual RCODE FLMAPI setAutoTurnOffKeepRflFlag( + virtual RCODE XFLAPI setAutoTurnOffKeepRflFlag( FLMBOOL bAutoTurnOff) = 0; - virtual RCODE FLMAPI getAutoTurnOffKeepRflFlag( + virtual RCODE XFLAPI getAutoTurnOffKeepRflFlag( FLMBOOL * pbAutoTurnOff) = 0; - virtual void FLMAPI setFileExtendSize( + virtual void XFLAPI setFileExtendSize( FLMUINT uiFileExtendSize) = 0; - virtual FLMUINT FLMAPI getFileExtendSize( void) = 0; + virtual FLMUINT XFLAPI getFileExtendSize( void) = 0; - virtual void FLMAPI setAppData( + virtual void XFLAPI setAppData( void * pvAppData) = 0; - virtual void * FLMAPI getAppData( void) = 0; + virtual void * XFLAPI getAppData( void) = 0; - virtual void FLMAPI setDeleteStatusObject( + virtual void XFLAPI setDeleteStatusObject( IF_DeleteStatus * pDeleteStatus) = 0; - virtual void FLMAPI setCommitClientObject( + virtual void XFLAPI setCommitClientObject( IF_CommitClient * pCommitClient) = 0; - virtual void FLMAPI setIndexingClientObject( + virtual void XFLAPI setIndexingClientObject( IF_IxClient * pIxClient) = 0; - virtual void FLMAPI setIndexingStatusObject( + virtual void XFLAPI setIndexingStatusObject( IF_IxStatus * pIxStatus) = 0; // Configuration information getting methods - virtual FLMUINT FLMAPI getDbVersion( void) = 0; + virtual FLMUINT XFLAPI getDbVersion( void) = 0; - virtual FLMUINT FLMAPI getBlockSize( void) = 0; + virtual FLMUINT XFLAPI getBlockSize( void) = 0; - virtual FLMUINT FLMAPI getDefaultLanguage( void) = 0; + virtual FLMUINT XFLAPI getDefaultLanguage( void) = 0; - virtual FLMUINT64 FLMAPI getTransID( void) = 0; + virtual FLMUINT64 XFLAPI getTransID( void) = 0; - virtual void FLMAPI getCheckpointInfo( + virtual void XFLAPI getCheckpointInfo( XFLM_CHECKPOINT_INFO * pCheckpointInfo) = 0; - virtual RCODE FLMAPI getDbControlFileName( + virtual RCODE XFLAPI getDbControlFileName( char * pszControlFileName, FLMUINT uiControlFileBufSize) = 0; - virtual RCODE FLMAPI getLockWaiters( + virtual RCODE XFLAPI getLockWaiters( IF_LockInfoClient * pLockInfo) = 0; - virtual RCODE FLMAPI getLastBackupTransID( + virtual RCODE XFLAPI getLastBackupTransID( FLMUINT64 * pui64LastBackupTransID) = 0; - virtual RCODE FLMAPI getBlocksChangedSinceBackup( + virtual RCODE XFLAPI getBlocksChangedSinceBackup( FLMUINT * puiBlocksChangedSinceBackup) = 0; - virtual RCODE FLMAPI getNextIncBackupSequenceNum( + virtual RCODE XFLAPI getNextIncBackupSequenceNum( FLMUINT * puiNextIncBackupSequenceNum) = 0; - virtual void FLMAPI getSerialNumber( + virtual void XFLAPI getSerialNumber( char * pucSerialNumber) = 0; - virtual RCODE FLMAPI getDiskSpaceUsage( + virtual RCODE XFLAPI getDiskSpaceUsage( FLMUINT64 * pui64DataSize, FLMUINT64 * pui64RollbackSize, FLMUINT64 * pui64RflSize) = 0; - virtual RCODE FLMAPI getMustCloseRC( void) = 0; + virtual RCODE XFLAPI getMustCloseRC( void) = 0; - virtual RCODE FLMAPI getAbortRC( void) = 0; + virtual RCODE XFLAPI getAbortRC( void) = 0; - virtual void FLMAPI setMustAbortTrans( + virtual void XFLAPI setMustAbortTrans( RCODE rc) = 0; }; /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_DOMNode : public F_Object + flminterface XFLEXP IF_DOMNode : public F_Object { - virtual RCODE FLMAPI createNode( + virtual RCODE XFLAPI createNode( IF_Db * pDb, eDomNodeType eNodeType, FLMUINT uiNameId, @@ -2961,146 +2984,146 @@ IF_DOMNode ** ppNewNode, FLMUINT64 * pui64NodeId = NULL) = 0; - virtual RCODE FLMAPI createChildElement( + virtual RCODE XFLAPI createChildElement( IF_Db * pDb, FLMUINT uiChildElementNameId, eNodeInsertLoc eLocation, IF_DOMNode ** ppNewChildElementNode, FLMUINT64 * pui64NodeId = NULL) = 0; - virtual RCODE FLMAPI deleteNode( + virtual RCODE XFLAPI deleteNode( IF_Db * pDb) = 0; - virtual RCODE FLMAPI deleteChildren( + virtual RCODE XFLAPI deleteChildren( IF_Db * pDb, FLMUINT uiNameId = 0) = 0; - virtual RCODE FLMAPI createAttribute( + virtual RCODE XFLAPI createAttribute( IF_Db * pDb, FLMUINT uiAttrNameId, IF_DOMNode ** ppAttrNode) = 0; - virtual RCODE FLMAPI getFirstAttribute( + virtual RCODE XFLAPI getFirstAttribute( IF_Db * pDb, IF_DOMNode ** ppAttrNode) = 0; - virtual RCODE FLMAPI getLastAttribute( + virtual RCODE XFLAPI getLastAttribute( IF_Db * pDb, IF_DOMNode ** ppAttrNode) = 0; - virtual RCODE FLMAPI getAttribute( + virtual RCODE XFLAPI getAttribute( IF_Db * pDb, FLMUINT uiAttrNameId, IF_DOMNode ** ppAttrNode) = 0; - virtual RCODE FLMAPI deleteAttribute( + virtual RCODE XFLAPI deleteAttribute( IF_Db * pDb, FLMUINT uiAttrNameId) = 0; - virtual RCODE FLMAPI hasAttribute( + virtual RCODE XFLAPI hasAttribute( IF_Db * pDb, FLMUINT uiAttrNameId, IF_DOMNode ** ppAttrNode = NULL) = 0; - virtual RCODE FLMAPI hasAttributes( + virtual RCODE XFLAPI hasAttributes( IF_Db * pDb, FLMBOOL * pbHasAttrs) = 0; - virtual RCODE FLMAPI hasNextSibling( + virtual RCODE XFLAPI hasNextSibling( IF_Db * pDb, FLMBOOL * pbHasNextSibling) = 0; - virtual RCODE FLMAPI hasPreviousSibling( + virtual RCODE XFLAPI hasPreviousSibling( IF_Db * pDb, FLMBOOL * pbHasPreviousSibling) = 0; - virtual RCODE FLMAPI hasChildren( + virtual RCODE XFLAPI hasChildren( IF_Db * pDb, FLMBOOL * pbHasChildren) = 0; - virtual RCODE FLMAPI isNamespaceDecl( + virtual RCODE XFLAPI isNamespaceDecl( IF_Db * pDb, FLMBOOL * pbIsNamespaceDecl) = 0; - virtual eDomNodeType FLMAPI getNodeType( void) = 0; + virtual eDomNodeType XFLAPI getNodeType( void) = 0; - virtual RCODE FLMAPI getNodeId( + virtual RCODE XFLAPI getNodeId( IF_Db * pDb, FLMUINT64 * pui64NodeId) = 0; - virtual RCODE FLMAPI getParentId( + virtual RCODE XFLAPI getParentId( IF_Db * pDb, FLMUINT64 * pui64ParentId) = 0; - virtual RCODE FLMAPI getDocumentId( + virtual RCODE XFLAPI getDocumentId( IF_Db * pDb, FLMUINT64 * pui64DocumentId) = 0; - virtual RCODE FLMAPI getPrevSibId( + virtual RCODE XFLAPI getPrevSibId( IF_Db * pDb, FLMUINT64 * pui64PrevSibId) = 0; - virtual RCODE FLMAPI getNextSibId( + virtual RCODE XFLAPI getNextSibId( IF_Db * pDb, FLMUINT64 * pui64NextSibId) = 0; - virtual RCODE FLMAPI getFirstChildId( + virtual RCODE XFLAPI getFirstChildId( IF_Db * pDb, FLMUINT64 * pui64FirstChildId) = 0; - virtual RCODE FLMAPI getLastChildId( + virtual RCODE XFLAPI getLastChildId( IF_Db * pDb, FLMUINT64 * pui64LastChildId) = 0; - virtual RCODE FLMAPI getNameId( + virtual RCODE XFLAPI getNameId( IF_Db * pDb, FLMUINT * puiNameId) = 0; - virtual RCODE FLMAPI getEncDefId( + virtual RCODE XFLAPI getEncDefId( IF_Db * pDb, FLMUINT * puiEncDefId) = 0; - virtual RCODE FLMAPI getDataType( + virtual RCODE XFLAPI getDataType( IF_Db * pDb, FLMUINT * puiDataType) = 0; - virtual RCODE FLMAPI getDataLength( + virtual RCODE XFLAPI getDataLength( IF_Db * pDb, FLMUINT * puiLength) = 0; - virtual RCODE FLMAPI getUINT32( + virtual RCODE XFLAPI getUINT32( IF_Db * pDb, FLMUINT32 * pui32Value) = 0; - virtual RCODE FLMAPI getUINT( + virtual RCODE XFLAPI getUINT( IF_Db * pDb, FLMUINT * puiValue) = 0; - virtual RCODE FLMAPI getUINT64( + virtual RCODE XFLAPI getUINT64( IF_Db * pDb, FLMUINT64 * pui64Value) = 0; - virtual RCODE FLMAPI getINT32( + virtual RCODE XFLAPI getINT32( IF_Db * pDb, FLMINT32 * pi32Value) = 0; - virtual RCODE FLMAPI getINT( + virtual RCODE XFLAPI getINT( IF_Db * pDb, FLMINT * piValue) = 0; - virtual RCODE FLMAPI getINT64( + virtual RCODE XFLAPI getINT64( IF_Db * pDb, FLMINT64 * pi64Value) = 0; - virtual RCODE FLMAPI getMetaValue( + virtual RCODE XFLAPI getMetaValue( IF_Db * pDb, FLMUINT64 * pui64Value) = 0; - virtual RCODE FLMAPI getUnicodeChars( + virtual RCODE XFLAPI getUnicodeChars( IF_Db * pDb, FLMUINT * puiNumChars) = 0; - virtual RCODE FLMAPI getUnicode( + virtual RCODE XFLAPI getUnicode( IF_Db * pDb, FLMUNICODE * puzValueBuffer, FLMUINT uiBufferSize, @@ -3109,15 +3132,15 @@ FLMUINT * puiCharsReturned = NULL, FLMUINT * puiBufferBytesUsed = NULL) = 0; - virtual RCODE FLMAPI getUnicode( + virtual RCODE XFLAPI getUnicode( IF_Db * pDb, FLMUNICODE ** ppuzUnicodeValue) = 0; - virtual RCODE FLMAPI getUnicode( + virtual RCODE XFLAPI getUnicode( IF_Db * pDb, F_DynaBuf * pDynaBuf) = 0; - virtual RCODE FLMAPI getUTF8( + virtual RCODE XFLAPI getUTF8( IF_Db * pDb, FLMBYTE * pucValueBuffer, FLMUINT uiBufferSize, @@ -3126,81 +3149,81 @@ FLMUINT * puiCharsReturned = NULL, FLMUINT * puiBufferBytesUsed = NULL) = 0; - virtual RCODE FLMAPI getUTF8( + virtual RCODE XFLAPI getUTF8( IF_Db * pDb, FLMBYTE ** ppszUTF8Value) = 0; - virtual RCODE FLMAPI getUTF8( + virtual RCODE XFLAPI getUTF8( IF_Db * pDb, F_DynaBuf * pDynaBuf) = 0; - virtual RCODE FLMAPI getBinary( + virtual RCODE XFLAPI getBinary( IF_Db * pDb, void * pvValue, FLMUINT uiByteOffset, FLMUINT uiBytesRequested, FLMUINT * puiBytesReturned) = 0; - virtual RCODE FLMAPI getBinary( + virtual RCODE XFLAPI getBinary( IF_Db * pDb, F_DynaBuf * pBuffer) = 0; - virtual RCODE FLMAPI getAttributeValueUINT32( + virtual RCODE XFLAPI getAttributeValueUINT32( IF_Db * pDb, FLMUINT uiAttrNameId, FLMUINT32 * pui32Num) = 0; - virtual RCODE FLMAPI getAttributeValueUINT32( + virtual RCODE XFLAPI getAttributeValueUINT32( IF_Db * pDb, FLMUINT uiAttrNameId, FLMUINT32 * pui32Num, FLMUINT32 ui32NotFoundDefault) = 0; - virtual RCODE FLMAPI getAttributeValueUINT( + virtual RCODE XFLAPI getAttributeValueUINT( IF_Db * pDb, FLMUINT uiAttrNameId, FLMUINT * puiNum) = 0; - virtual RCODE FLMAPI getAttributeValueUINT( + virtual RCODE XFLAPI getAttributeValueUINT( IF_Db * pDb, FLMUINT uiAttrNameId, FLMUINT * puiNum, FLMUINT uiNotFoundDefault) = 0; - virtual RCODE FLMAPI getAttributeValueUINT64( + virtual RCODE XFLAPI getAttributeValueUINT64( IF_Db * pDb, FLMUINT uiAttrNameId, FLMUINT64 * pui64Num) = 0; - virtual RCODE FLMAPI getAttributeValueUINT64( + virtual RCODE XFLAPI getAttributeValueUINT64( IF_Db * pDb, FLMUINT uiAttrNameId, FLMUINT64 * pui64Num, FLMUINT64 ui64NotFoundDefault) = 0; - virtual RCODE FLMAPI getAttributeValueINT( + virtual RCODE XFLAPI getAttributeValueINT( IF_Db * pDb, FLMUINT uiAttrNameId, FLMINT * piNum) = 0; - virtual RCODE FLMAPI getAttributeValueINT( + virtual RCODE XFLAPI getAttributeValueINT( IF_Db * pDb, FLMUINT uiAttrNameId, FLMINT * piNum, FLMINT iNotFoundDefault) = 0; - virtual RCODE FLMAPI getAttributeValueINT64( + virtual RCODE XFLAPI getAttributeValueINT64( IF_Db * pDb, FLMUINT uiAttrNameId, FLMINT64 * pi64Num) = 0; - virtual RCODE FLMAPI getAttributeValueINT64( + virtual RCODE XFLAPI getAttributeValueINT64( IF_Db * pDb, FLMUINT uiAttrNameId, FLMINT64 * pi64Num, FLMINT64 i64NotFoundDefault) = 0; - virtual RCODE FLMAPI getAttributeValueUnicode( + virtual RCODE XFLAPI getAttributeValueUnicode( IF_Db * pDb, FLMUINT uiAttrNameId, FLMUNICODE * puzValueBuffer, @@ -3208,17 +3231,17 @@ FLMUINT * puiCharsReturned = NULL, FLMUINT * puiBufferBytesUsed = NULL) = 0; - virtual RCODE FLMAPI getAttributeValueUnicode( + virtual RCODE XFLAPI getAttributeValueUnicode( IF_Db * pDb, FLMUINT uiAttrNameId, FLMUNICODE ** ppuzValueBuffer) = 0; - virtual RCODE FLMAPI getAttributeValueUnicode( + virtual RCODE XFLAPI getAttributeValueUnicode( IF_Db * pDb, FLMUINT uiAttrNameId, F_DynaBuf * pDynaBuf) = 0; - virtual RCODE FLMAPI getAttributeValueUTF8( + virtual RCODE XFLAPI getAttributeValueUTF8( IF_Db * pDb, FLMUINT uiAttrNameId, FLMBYTE * pucValueBuffer, @@ -3226,285 +3249,285 @@ FLMUINT * puiCharsReturned = NULL, FLMUINT * puiBufferBytesUsed = NULL) = 0; - virtual RCODE FLMAPI getAttributeValueUTF8( + virtual RCODE XFLAPI getAttributeValueUTF8( IF_Db * pDb, FLMUINT uiAttrNameId, FLMBYTE ** ppszValueBuffer) = 0; - virtual RCODE FLMAPI getAttributeValueUTF8( + virtual RCODE XFLAPI getAttributeValueUTF8( IF_Db * pDb, FLMUINT uiAttrNameId, F_DynaBuf * pDynaBuf) = 0; - virtual RCODE FLMAPI getAttributeValueBinary( + virtual RCODE XFLAPI getAttributeValueBinary( IF_Db * pDb, FLMUINT uiAttrNameId, void * pvValueBuffer, FLMUINT uiBufferSize, FLMUINT * puiValueLength) = 0; - virtual RCODE FLMAPI getAttributeValueBinary( + virtual RCODE XFLAPI getAttributeValueBinary( IF_Db * pDb, FLMUINT uiAttrNameId, F_DynaBuf * pDynaBuf) = 0; - virtual RCODE FLMAPI setUINT( + virtual RCODE XFLAPI setUINT( IF_Db * pDb, FLMUINT uiValue, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setUINT64( + virtual RCODE XFLAPI setUINT64( IF_Db * pDb, FLMUINT64 ui64Value, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setINT( + virtual RCODE XFLAPI setINT( IF_Db * pDb, FLMINT iValue, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setINT64( + virtual RCODE XFLAPI setINT64( IF_Db * pDb, FLMINT64 i64Value, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setMetaValue( + virtual RCODE XFLAPI setMetaValue( IF_Db * pDb, FLMUINT64 ui64Value) = 0; - virtual RCODE FLMAPI setUnicode( + virtual RCODE XFLAPI setUnicode( IF_Db * pDb, const FLMUNICODE * puzValue, FLMUINT uiValueLength = 0, FLMBOOL bLast = TRUE, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setUTF8( + virtual RCODE XFLAPI setUTF8( IF_Db * pDb, const FLMBYTE * pszValue, FLMUINT uiValueLength = 0, FLMBOOL bLast = TRUE, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setBinary( + virtual RCODE XFLAPI setBinary( IF_Db * pDb, const void * pvValue, FLMUINT uiValueLength, FLMBOOL bLast = TRUE, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setAttributeValueUINT( + virtual RCODE XFLAPI setAttributeValueUINT( IF_Db * pDb, FLMUINT uiAttrNameId, FLMUINT uiValue, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setAttributeValueUINT64( + virtual RCODE XFLAPI setAttributeValueUINT64( IF_Db * pDb, FLMUINT uiAttrNameId, FLMUINT64 ui64Value, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setAttributeValueINT( + virtual RCODE XFLAPI setAttributeValueINT( IF_Db * pDb, FLMUINT uiAttrNameId, FLMINT iValue, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setAttributeValueINT64( + virtual RCODE XFLAPI setAttributeValueINT64( IF_Db * pDb, FLMUINT uiAttrNameId, FLMINT64 i64Value, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setAttributeValueUnicode( + virtual RCODE XFLAPI setAttributeValueUnicode( IF_Db * pDb, FLMUINT uiAttrNameId, const FLMUNICODE * puzValue, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setAttributeValueUTF8( + virtual RCODE XFLAPI setAttributeValueUTF8( IF_Db * pDb, FLMUINT uiAttrNameId, const FLMBYTE * pucValue, FLMUINT uiLength = 0, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI setAttributeValueBinary( + virtual RCODE XFLAPI setAttributeValueBinary( IF_Db * pDb, FLMUINT uiAttrNameId, const void * pvValue, FLMUINT uiLength, FLMUINT uiEncDefId = 0) = 0; - virtual RCODE FLMAPI getDocumentNode( + virtual RCODE XFLAPI getDocumentNode( IF_Db * pDb, IF_DOMNode ** ppDocument) = 0; - virtual RCODE FLMAPI getNextDocument( + virtual RCODE XFLAPI getNextDocument( IF_Db * pDb, IF_DOMNode ** ppNextDocument) = 0; - virtual RCODE FLMAPI getPreviousDocument( + virtual RCODE XFLAPI getPreviousDocument( IF_Db * pDb, IF_DOMNode ** ppPrevDocument) = 0; - virtual RCODE FLMAPI getParentNode( + virtual RCODE XFLAPI getParentNode( IF_Db * pDb, IF_DOMNode ** ppParent) = 0; - virtual RCODE FLMAPI getFirstChild( + virtual RCODE XFLAPI getFirstChild( IF_Db * pDb, IF_DOMNode ** ppFirstChild) = 0; - virtual RCODE FLMAPI getLastChild( + virtual RCODE XFLAPI getLastChild( IF_Db * pDb, IF_DOMNode ** ppLastChild) = 0; - virtual RCODE FLMAPI getNextSibling( + virtual RCODE XFLAPI getNextSibling( IF_Db * pDb, IF_DOMNode ** ppNextSibling) = 0; - virtual RCODE FLMAPI getPreviousSibling( + virtual RCODE XFLAPI getPreviousSibling( IF_Db * pDb, IF_DOMNode ** ppPrevSibling) = 0; - virtual RCODE FLMAPI getChild( + virtual RCODE XFLAPI getChild( IF_Db * pDb, eDomNodeType eNodeType, IF_DOMNode ** ppChild) = 0; - virtual RCODE FLMAPI getChildElement( + virtual RCODE XFLAPI getChildElement( IF_Db * pDb, FLMUINT uiElementNameId, IF_DOMNode ** ppChild, FLMUINT uiFlags = 0) = 0; - virtual RCODE FLMAPI getSiblingElement( + virtual RCODE XFLAPI getSiblingElement( IF_Db * pDb, FLMUINT uiElementNameId, FLMBOOL bNext, IF_DOMNode ** ppSibling) = 0; - virtual RCODE FLMAPI getAncestorElement( + virtual RCODE XFLAPI getAncestorElement( IF_Db * pDb, FLMUINT uiElementNameId, IF_DOMNode ** ppAncestor) = 0; - virtual RCODE FLMAPI getDescendantElement( + virtual RCODE XFLAPI getDescendantElement( IF_Db * pDb, FLMUINT uiElementNameId, IF_DOMNode ** ppDescendant) = 0; - virtual RCODE FLMAPI insertBefore( + virtual RCODE XFLAPI insertBefore( IF_Db * pDb, IF_DOMNode * pNewChild, IF_DOMNode * pRefChild) = 0; - virtual RCODE FLMAPI getPrefix( + virtual RCODE XFLAPI getPrefix( IF_Db * pDb, FLMUNICODE * puzPrefixBuffer, FLMUINT uiBufferSize, FLMUINT * puiCharsReturned = NULL) = 0; - virtual RCODE FLMAPI getPrefix( + virtual RCODE XFLAPI getPrefix( IF_Db * pDb, char * pszPrefixBuffer, FLMUINT uiBufferSize, FLMUINT * puiCharsReturned = NULL) = 0; - virtual RCODE FLMAPI getPrefixId( + virtual RCODE XFLAPI getPrefixId( IF_Db * pDb, FLMUINT * puiPrefixId) = 0; - virtual RCODE FLMAPI setPrefix( + virtual RCODE XFLAPI setPrefix( IF_Db * pDb, const FLMUNICODE * puzPrefix) = 0; - virtual RCODE FLMAPI setPrefix( + virtual RCODE XFLAPI setPrefix( IF_Db * pDb, const char * pszPrefix) = 0; - virtual RCODE FLMAPI setPrefixId( + virtual RCODE XFLAPI setPrefixId( IF_Db * pDb, FLMUINT uiPrefixId) = 0; - virtual RCODE FLMAPI getNamespaceURI( + virtual RCODE XFLAPI getNamespaceURI( IF_Db * pDb, FLMUNICODE * puzNamespaceURIBuffer, FLMUINT uiBufferSize, FLMUINT * puiCharsReturned = NULL) = 0; - virtual RCODE FLMAPI getNamespaceURI( + virtual RCODE XFLAPI getNamespaceURI( IF_Db * pDb, char * pszNamespaceURIBuffer, FLMUINT uiBufferSize, FLMUINT * puiCharsReturned = NULL) = 0; - virtual RCODE FLMAPI getLocalName( + virtual RCODE XFLAPI getLocalName( IF_Db * pDb, FLMUNICODE * puzLocalNameBuffer, FLMUINT uiBufferSize, FLMUINT * puiCharsReturned = NULL) = 0; - virtual RCODE FLMAPI getLocalName( + virtual RCODE XFLAPI getLocalName( IF_Db * pDb, char * pszLocalNameBuffer, FLMUINT uiBufferSize, FLMUINT * puiCharsReturned = NULL) = 0; - virtual RCODE FLMAPI getQualifiedName( + virtual RCODE XFLAPI getQualifiedName( IF_Db * pDb, FLMUNICODE * puzQualifiedNameBuffer, FLMUINT uiBufferSize, FLMUINT * puiCharsReturned = NULL) = 0; - virtual RCODE FLMAPI getQualifiedName( + virtual RCODE XFLAPI getQualifiedName( IF_Db * pDb, char * pszQualifiedNameBuffer, FLMUINT uiBufferSize, FLMUINT * puiCharsReturned = NULL) = 0; - virtual RCODE FLMAPI getCollection( + virtual RCODE XFLAPI getCollection( IF_Db * pDb, FLMUINT * puiCollection) = 0; - virtual RCODE FLMAPI createAnnotation( + virtual RCODE XFLAPI createAnnotation( IF_Db * pDb, IF_DOMNode ** ppAnnotation, FLMUINT64 * pui64NodeId = NULL) = 0; - virtual RCODE FLMAPI getAnnotation( + virtual RCODE XFLAPI getAnnotation( IF_Db * pDb, IF_DOMNode ** ppAnnotation) = 0; - virtual RCODE FLMAPI getAnnotationId( + virtual RCODE XFLAPI getAnnotationId( IF_Db * pDb, FLMUINT64 * pui64AnnotationId) = 0; - virtual RCODE FLMAPI hasAnnotation( + virtual RCODE XFLAPI hasAnnotation( IF_Db * pDb, FLMBOOL * pbHasAnnotation) = 0; - virtual RCODE FLMAPI getIStream( + virtual RCODE XFLAPI getIStream( IF_Db * pDb, IF_PosIStream ** ppIStream, FLMUINT * puiDataType = NULL, FLMUINT * puiDataLength = NULL) = 0; - virtual RCODE FLMAPI getTextIStream( + virtual RCODE XFLAPI getTextIStream( IF_Db * pDb, IF_PosIStream ** ppIStream, FLMUINT * puiNumChars = NULL) = 0; - virtual FLMUINT FLMAPI compareNode( + virtual FLMUINT XFLAPI compareNode( IF_DOMNode * pNode, IF_Db * pDb1, IF_Db * pDb2, char * pszErrBuff, FLMUINT uiErrBuffLen) = 0; - virtual RCODE FLMAPI isDataLocalToNode( + virtual RCODE XFLAPI isDataLocalToNode( IF_Db * pDb, FLMBOOL * pbDataIsLocal) = 0; }; @@ -3512,137 +3535,137 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_DataVector : public F_Object + flminterface XFLEXP IF_DataVector : public F_Object { - virtual void FLMAPI setDocumentID( + virtual void XFLAPI setDocumentID( FLMUINT64 ui64DocumentID) = 0; - virtual RCODE FLMAPI setID( + virtual RCODE XFLAPI setID( FLMUINT uiElementNumber, FLMUINT64 ui64ID) = 0; - virtual RCODE FLMAPI setNameId( + virtual RCODE XFLAPI setNameId( FLMUINT uiElementNumber, FLMUINT uiNameId, FLMBOOL bIsAttr, FLMBOOL bIsData) = 0; - virtual RCODE FLMAPI setINT( + virtual RCODE XFLAPI setINT( FLMUINT uiElementNumber, FLMINT iNum) = 0; - virtual RCODE FLMAPI setINT64( + virtual RCODE XFLAPI setINT64( FLMUINT uiElementNumber, FLMINT64 i64Num) = 0; - virtual RCODE FLMAPI setUINT( + virtual RCODE XFLAPI setUINT( FLMUINT uiElementNumber, FLMUINT uiNum) = 0; - virtual RCODE FLMAPI setUINT64( + virtual RCODE XFLAPI setUINT64( FLMUINT uiElementNumber, FLMUINT64 ui64Num) = 0; - virtual RCODE FLMAPI setUnicode( + virtual RCODE XFLAPI setUnicode( FLMUINT uiElementNumber, const FLMUNICODE * puzUnicode) = 0; - virtual RCODE FLMAPI setUTF8( + virtual RCODE XFLAPI setUTF8( FLMUINT uiElementNumber, const FLMBYTE * pszUtf8, FLMUINT uiBytesInBuffer = 0) = 0; - virtual RCODE FLMAPI setBinary( + virtual RCODE XFLAPI setBinary( FLMUINT uiElementNumber, const void * pvBinary, FLMUINT uiBinaryLen) = 0; - virtual void FLMAPI setRightTruncated( + virtual void XFLAPI setRightTruncated( FLMUINT uiElementNumber) = 0; - virtual void FLMAPI setLeftTruncated( + virtual void XFLAPI setLeftTruncated( FLMUINT uiElementNumber) = 0; - virtual void FLMAPI clearRightTruncated( + virtual void XFLAPI clearRightTruncated( FLMUINT uiElementNumber) = 0; - virtual void FLMAPI clearLeftTruncated( + virtual void XFLAPI clearLeftTruncated( FLMUINT uiElementNumber) = 0; - virtual FLMBOOL FLMAPI isRightTruncated( + virtual FLMBOOL XFLAPI isRightTruncated( FLMUINT uiElementNumber) = 0; - virtual FLMBOOL FLMAPI isLeftTruncated( + virtual FLMBOOL XFLAPI isLeftTruncated( FLMUINT uiElementNumber) = 0; - virtual FLMUINT64 FLMAPI getDocumentID( void) = 0; + virtual FLMUINT64 XFLAPI getDocumentID( void) = 0; - virtual FLMUINT64 FLMAPI getID( + virtual FLMUINT64 XFLAPI getID( FLMUINT uiElementNumber) = 0; - virtual FLMUINT FLMAPI getNameId( + virtual FLMUINT XFLAPI getNameId( FLMUINT uiElementNumber) = 0; - virtual FLMBOOL FLMAPI isAttr( + virtual FLMBOOL XFLAPI isAttr( FLMUINT uiElementNumber) = 0; - virtual FLMBOOL FLMAPI isDataComponent( + virtual FLMBOOL XFLAPI isDataComponent( FLMUINT uiElementNumber) = 0; - virtual FLMBOOL FLMAPI isKeyComponent( + virtual FLMBOOL XFLAPI isKeyComponent( FLMUINT uiElementNumber) = 0; - virtual FLMUINT FLMAPI getDataLength( + virtual FLMUINT XFLAPI getDataLength( FLMUINT uiElementNumber) = 0; - virtual FLMUINT FLMAPI getDataType( + virtual FLMUINT XFLAPI getDataType( FLMUINT uiElementNumber) = 0; - virtual RCODE FLMAPI getUTF8Ptr( + virtual RCODE XFLAPI getUTF8Ptr( FLMUINT uiElementNumber, const FLMBYTE ** ppszUTF8, FLMUINT * puiBufLen) = 0; - virtual RCODE FLMAPI getINT( + virtual RCODE XFLAPI getINT( FLMUINT uiElementNumber, FLMINT * piNum) = 0; - virtual RCODE FLMAPI getINT64( + virtual RCODE XFLAPI getINT64( FLMUINT uiElementNumber, FLMINT64 * pi64Num) = 0; - virtual RCODE FLMAPI getUINT( + virtual RCODE XFLAPI getUINT( FLMUINT uiElementNumber, FLMUINT * puiNum) = 0; - virtual RCODE FLMAPI getUINT64( + virtual RCODE XFLAPI getUINT64( FLMUINT uiElementNumber, FLMUINT64 * pui64Num) = 0; - virtual RCODE FLMAPI getUnicode( + virtual RCODE XFLAPI getUnicode( FLMUINT uiElementNumber, FLMUNICODE ** ppuzUnicode) = 0; - virtual RCODE FLMAPI getUnicode( + virtual RCODE XFLAPI getUnicode( FLMUINT uiElementNumber, FLMUNICODE * puzUnicode, FLMUINT * puiBufLen) = 0; - virtual RCODE FLMAPI getUnicode( + virtual RCODE XFLAPI getUnicode( FLMUINT uiElementNumber, F_DynaBuf * pBuffer) = 0; - virtual RCODE FLMAPI getUTF8( + virtual RCODE XFLAPI getUTF8( FLMUINT uiElementNumber, FLMBYTE * pszUTF8, FLMUINT * puiBufLen) = 0; - virtual RCODE FLMAPI getBinary( + virtual RCODE XFLAPI getBinary( FLMUINT uiElementNumber, void * pvBuffer, FLMUINT * puiBufferLen) = 0; - virtual RCODE FLMAPI outputKey( + virtual RCODE XFLAPI outputKey( IF_Db * pDb, FLMUINT uiIndexNum, FLMUINT uiMatchFlags, @@ -3650,20 +3673,20 @@ FLMUINT uiKeyBufSize, FLMUINT * puiKeyLen) = 0; - virtual RCODE FLMAPI outputData( + virtual RCODE XFLAPI outputData( IF_Db * pDb, FLMUINT uiIndexNum, FLMBYTE * pucDataBuf, FLMUINT uiDataBufSize, FLMUINT * puiDataLen) = 0; - virtual RCODE FLMAPI inputKey( + virtual RCODE XFLAPI inputKey( IF_Db * pDb, FLMUINT uiIndexNum, const FLMBYTE * pucKey, FLMUINT uiKeyLen) = 0; - virtual RCODE FLMAPI inputData( + virtual RCODE XFLAPI inputData( IF_Db * pDb, FLMUINT uiIndexNum, const FLMBYTE * pucData, @@ -3671,29 +3694,29 @@ // Miscellaneous methods - virtual void FLMAPI reset( void) = 0; + virtual void XFLAPI reset( void) = 0; - virtual const void * FLMAPI getDataPtr( + virtual const void * XFLAPI getDataPtr( FLMUINT uiElementNumber) = 0; }; /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_Backup : public F_Object + flminterface XFLEXP IF_Backup : public F_Object { - virtual FLMUINT64 FLMAPI getBackupTransId( void) = 0; + virtual FLMUINT64 XFLAPI getBackupTransId( void) = 0; - virtual FLMUINT64 FLMAPI getLastBackupTransId( void) = 0; + virtual FLMUINT64 XFLAPI getLastBackupTransId( void) = 0; - virtual RCODE FLMAPI backup( + virtual RCODE XFLAPI backup( const char * pszBackupPath, const char * pszPassword, IF_BackupClient * ifpClient, IF_BackupStatus * ifpStatus, FLMUINT * puiIncSeqNum) = 0; - virtual RCODE FLMAPI endBackup( void) = 0; + virtual RCODE XFLAPI endBackup( void) = 0; }; // Note: Any interfaces ending in Client or Status are interfaces @@ -3706,9 +3729,9 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_BackupClient : public F_Object + flminterface XFLEXP IF_BackupClient : public F_Object { - virtual RCODE FLMAPI WriteData( + virtual RCODE XFLAPI WriteData( const void * pvBuffer, FLMUINT uiBytesToWrite) = 0; }; @@ -3716,9 +3739,9 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_BackupStatus : public F_Object + flminterface XFLEXP IF_BackupStatus : public F_Object { - virtual RCODE FLMAPI backupStatus( + virtual RCODE XFLAPI backupStatus( FLMUINT64 ui64BytesToDo, FLMUINT64 ui64BytesDone) = 0; }; @@ -3726,18 +3749,18 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_CommitClient : public F_Object + flminterface XFLEXP IF_CommitClient : public F_Object { - virtual void FLMAPI commit( + virtual void XFLAPI commit( IF_Db * pDb) = 0; }; /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_EventClient : public F_Object + flminterface XFLEXP IF_EventClient : public F_Object { - virtual void FLMAPI catchEvent( + virtual void XFLAPI catchEvent( eEventType eEvent, IF_Db * pDb, FLMUINT uiThreadId, @@ -3750,9 +3773,9 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_IxClient : public F_Object + flminterface XFLEXP IF_IxClient : public F_Object { - virtual RCODE FLMAPI doIndexing( + virtual RCODE XFLAPI doIndexing( IF_Db * pDb, FLMUINT uiIndexNum, FLMUINT uiCollectionNum, @@ -3762,39 +3785,39 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_RestoreStatus : public F_Object + flminterface XFLEXP IF_RestoreStatus : public F_Object { - virtual RCODE FLMAPI reportProgress( + virtual RCODE XFLAPI reportProgress( eRestoreAction * peAction, FLMUINT64 ui64BytesToDo, FLMUINT64 ui64BytesDone) = 0; - virtual RCODE FLMAPI reportError( + virtual RCODE XFLAPI reportError( eRestoreAction * peAction, RCODE rcErr) = 0; - virtual RCODE FLMAPI reportOpenRflFile( + virtual RCODE XFLAPI reportOpenRflFile( eRestoreAction * peAction, FLMUINT uiFileNum) = 0; - virtual RCODE FLMAPI reportRflRead( + virtual RCODE XFLAPI reportRflRead( eRestoreAction * peAction, FLMUINT uiFileNum, FLMUINT uiBytesRead) = 0; - virtual RCODE FLMAPI reportBeginTrans( + virtual RCODE XFLAPI reportBeginTrans( eRestoreAction * peAction, FLMUINT64 ui64TransId) = 0; - virtual RCODE FLMAPI reportCommitTrans( + virtual RCODE XFLAPI reportCommitTrans( eRestoreAction * peAction, FLMUINT64 ui64TransId) = 0; - virtual RCODE FLMAPI reportAbortTrans( + virtual RCODE XFLAPI reportAbortTrans( eRestoreAction * peAction, FLMUINT64 ui64TransId) = 0; - virtual RCODE FLMAPI reportBlockChainFree( + virtual RCODE XFLAPI reportBlockChainFree( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT64 ui64MaintDocNum, @@ -3802,66 +3825,66 @@ FLMUINT uiEndBlkAddr, FLMUINT uiCount) = 0; - virtual RCODE FLMAPI reportIndexSuspend( + virtual RCODE XFLAPI reportIndexSuspend( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiIndexNum) = 0; - virtual RCODE FLMAPI reportIndexResume( + virtual RCODE XFLAPI reportIndexResume( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiIndexNum) = 0; - virtual RCODE FLMAPI reportReduce( + virtual RCODE XFLAPI reportReduce( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCount) = 0; - virtual RCODE FLMAPI reportUpgrade( + virtual RCODE XFLAPI reportUpgrade( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiOldDbVersion, FLMUINT uiNewDbVersion) = 0; - virtual RCODE FLMAPI reportEnableEncryption( + virtual RCODE XFLAPI reportEnableEncryption( eRestoreAction * peAction, FLMUINT64 ui64TransId) = 0; - virtual RCODE FLMAPI reportWrapKey( + virtual RCODE XFLAPI reportWrapKey( eRestoreAction * peAction, FLMUINT64 ui64TransId) = 0; - virtual RCODE FLMAPI reportRollOverDbKey( + virtual RCODE XFLAPI reportRollOverDbKey( eRestoreAction * peAction, FLMUINT64 ui64TransId) = 0; - virtual RCODE FLMAPI reportDocumentDone( + virtual RCODE XFLAPI reportDocumentDone( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, FLMUINT64 ui64DocumentId) = 0; - virtual RCODE FLMAPI reportNodeDelete( + virtual RCODE XFLAPI reportNodeDelete( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, FLMUINT64 ui64NodeId) = 0; - virtual RCODE FLMAPI reportAttributeDelete( + virtual RCODE XFLAPI reportAttributeDelete( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, FLMUINT64 ui64ElementId, FLMUINT uiAttrNameId) = 0; - virtual RCODE FLMAPI reportNodeChildrenDelete( + virtual RCODE XFLAPI reportNodeChildrenDelete( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, FLMUINT64 ui64ParentNodeId, FLMUINT uiNameId) = 0; - virtual RCODE FLMAPI reportNodeCreate( + virtual RCODE XFLAPI reportNodeCreate( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, @@ -3870,7 +3893,7 @@ FLMUINT uiNameId, eNodeInsertLoc eLocation) = 0; - virtual RCODE FLMAPI reportInsertBefore( + virtual RCODE XFLAPI reportInsertBefore( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, @@ -3878,26 +3901,26 @@ FLMUINT64 ui64NewChildNodeId, FLMUINT64 ui64RefChildNodeId) = 0; - virtual RCODE FLMAPI reportNodeUpdate( + virtual RCODE XFLAPI reportNodeUpdate( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, FLMUINT64 ui64NodeId) = 0; - virtual RCODE FLMAPI reportNodeSetValue( + virtual RCODE XFLAPI reportNodeSetValue( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, FLMUINT64 ui64NodeId) = 0; - virtual RCODE FLMAPI reportAttributeSetValue( + virtual RCODE XFLAPI reportAttributeSetValue( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, FLMUINT64 ui64ElementNodeId, FLMUINT uiAttrNameId) = 0; - virtual RCODE FLMAPI reportNodeFlagsUpdate( + virtual RCODE XFLAPI reportNodeFlagsUpdate( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, @@ -3905,7 +3928,7 @@ FLMUINT uiFlags, FLMBOOL bAdd) = 0; - virtual RCODE FLMAPI reportNodeSetPrefixId( + virtual RCODE XFLAPI reportNodeSetPrefixId( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, @@ -3913,14 +3936,14 @@ FLMUINT uiAttrNameId, FLMUINT uiPrefixId) = 0; - virtual RCODE FLMAPI reportNodeSetMetaValue( + virtual RCODE XFLAPI reportNodeSetMetaValue( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, FLMUINT64 ui64NodeId, FLMUINT64 ui64MetaValue) = 0; - virtual RCODE FLMAPI reportSetNextNodeId( + virtual RCODE XFLAPI reportSetNextNodeId( eRestoreAction * peAction, FLMUINT64 ui64TransId, FLMUINT uiCollection, @@ -3930,40 +3953,40 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_RestoreClient : public F_Object + flminterface XFLEXP IF_RestoreClient : public F_Object { - virtual RCODE FLMAPI openBackupSet( void) = 0; + virtual RCODE XFLAPI openBackupSet( void) = 0; - virtual RCODE FLMAPI openRflFile( // Open an RFL file + virtual RCODE XFLAPI openRflFile( // Open an RFL file FLMUINT uiFileNum) = 0; - virtual RCODE FLMAPI openIncFile( // Open an incremental backup file + virtual RCODE XFLAPI openIncFile( // Open an incremental backup file FLMUINT uiFileNum) = 0; - virtual RCODE FLMAPI read( + virtual RCODE XFLAPI read( FLMUINT uiLength, // Number of bytes to read void * pvBuffer, // Buffer to place read bytes into FLMUINT * puiBytesRead) = 0; // [out] Number of bytes read - virtual RCODE FLMAPI close( void) = 0; // Close the current file + virtual RCODE XFLAPI close( void) = 0; // Close the current file - virtual RCODE FLMAPI abortFile( void) = 0; // Abort processing the file + virtual RCODE XFLAPI abortFile( void) = 0; // Abort processing the file // and close file handles, etc. }; /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_UpgradeClient : public F_Object + flminterface XFLEXP IF_UpgradeClient : public F_Object { }; /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_DbCopyStatus : public F_Object + flminterface XFLEXP IF_DbCopyStatus : public F_Object { - virtual RCODE FLMAPI dbCopyStatus( + virtual RCODE XFLAPI dbCopyStatus( FLMUINT64 ui64BytesToCopy, FLMUINT64 ui64BytesCopied, FLMBOOL bNewSrcFile, @@ -3974,24 +3997,24 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_DbRebuildStatus : public F_Object + flminterface XFLEXP IF_DbRebuildStatus : public F_Object { - virtual RCODE FLMAPI reportRebuild( + virtual RCODE XFLAPI reportRebuild( XFLM_REBUILD_INFO * pRebuild) = 0; - virtual RCODE FLMAPI reportRebuildErr( + virtual RCODE XFLAPI reportRebuildErr( XFLM_CORRUPT_INFO * pCorruptInfo) = 0; }; /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_DbCheckStatus : public F_Object + flminterface XFLEXP IF_DbCheckStatus : public F_Object { - virtual RCODE FLMAPI reportProgress( + virtual RCODE XFLAPI reportProgress( XFLM_PROGRESS_CHECK_INFO * pProgCheck) = 0; - virtual RCODE FLMAPI reportCheckErr( + virtual RCODE XFLAPI reportCheckErr( XFLM_CORRUPT_INFO * pCorruptInfo, FLMBOOL * pbFix) = 0; // [OUT] - If the client sets this to true, then XFlaim will @@ -4005,9 +4028,9 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_DbRenameStatus : public F_Object + flminterface XFLEXP IF_DbRenameStatus : public F_Object { - virtual RCODE FLMAPI dbRenameStatus( + virtual RCODE XFLAPI dbRenameStatus( const char * pszSrcFileName, const char * pszDstFileName) = 0; }; @@ -4015,47 +4038,47 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_IxStatus : public F_Object + flminterface XFLEXP IF_IxStatus : public F_Object { - virtual RCODE FLMAPI reportIndex( + virtual RCODE XFLAPI reportIndex( FLMUINT64 ui64LastDocumentId) = 0; }; /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_DbInfo : public F_Object + flminterface XFLEXP IF_DbInfo : public F_Object { - virtual FLMUINT FLMAPI getNumCollections( void) = 0; + virtual FLMUINT XFLAPI getNumCollections( void) = 0; - virtual FLMUINT FLMAPI getNumIndexes( void) = 0; + virtual FLMUINT XFLAPI getNumIndexes( void) = 0; - virtual FLMUINT FLMAPI getNumLogicalFiles( void) = 0; + virtual FLMUINT XFLAPI getNumLogicalFiles( void) = 0; - virtual FLMUINT64 FLMAPI getFileSize( void) = 0; + virtual FLMUINT64 XFLAPI getFileSize( void) = 0; - virtual const XFLM_DB_HDR * FLMAPI getDbHdr( void) = 0; + virtual const XFLM_DB_HDR * XFLAPI getDbHdr( void) = 0; - virtual void FLMAPI getAvailBlockStats( + virtual void XFLAPI getAvailBlockStats( FLMUINT64 * pui64BytesUsed, FLMUINT * puiBlockCount, FLMINT32 * pi32LastError, FLMUINT * puiNumErrors) = 0; - virtual void FLMAPI getLFHBlockStats( + virtual void XFLAPI getLFHBlockStats( FLMUINT64 * pui64BytesUsed, FLMUINT * puiBlockCount, FLMINT32 * pi32LastError, FLMUINT * puiNumErrors) = 0; - virtual void FLMAPI getBTreeInfo( + virtual void XFLAPI getBTreeInfo( FLMUINT uiNthLogicalFile, FLMUINT * puiLfNum, eLFileType * peLfType, FLMUINT * puiRootBlkAddress, FLMUINT * puiNumLevels) = 0; - virtual void FLMAPI getBTreeBlockStats( + virtual void XFLAPI getBTreeBlockStats( FLMUINT uiNthLogicalFile, FLMUINT uiLevel, FLMUINT64 * pui64KeyCount, @@ -4071,20 +4094,20 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_QueryStatus : public F_Object + flminterface XFLEXP IF_QueryStatus : public F_Object { - virtual RCODE FLMAPI queryStatus( + virtual RCODE XFLAPI queryStatus( XFLM_OPT_INFO * pOptInfo) = 0; - virtual RCODE FLMAPI newSource( + virtual RCODE XFLAPI newSource( XFLM_OPT_INFO * pOptInfo) = 0; - virtual RCODE FLMAPI resultSetStatus( + virtual RCODE XFLAPI resultSetStatus( FLMUINT64 ui64TotalDocsRead, FLMUINT64 ui64TotalDocsPassed, FLMBOOL bCanRetrieveDocs) = 0; - virtual RCODE FLMAPI resultSetComplete( + virtual RCODE XFLAPI resultSetComplete( FLMUINT64 ui64TotalDocsRead, FLMUINT64 ui64TotalDocsPassed) = 0; }; @@ -4092,9 +4115,9 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_QueryValidator : public F_Object + flminterface XFLEXP IF_QueryValidator : public F_Object { - virtual RCODE FLMAPI validateNode( + virtual RCODE XFLAPI validateNode( IF_Db * pDb, IF_DOMNode * pNode, FLMBOOL * pbPassed) = 0; @@ -4103,14 +4126,14 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_QueryValFunc : public F_Object + flminterface XFLEXP IF_QueryValFunc : public F_Object { // NOTE: pDynaBuf should only be used when returning XFLM_UTF8_VAL or // XFLM_BINARY_VAL. pvVal should be used for all other types. // If there are no more values, return NE_XFLM_EOF_HIT or // NE_XFLM_BOF_HIT, depending on eValueToGet. - virtual RCODE FLMAPI getValue( + virtual RCODE XFLAPI getValue( IF_Db * pDb, IF_DOMNode * pContextNode, ValIterator eValueToGet, @@ -4119,7 +4142,7 @@ void * pvVal, F_DynaBuf * pDynaBuf = NULL) = 0; - virtual RCODE FLMAPI cloneSelf( + virtual RCODE XFLAPI cloneSelf( IF_QueryValFunc ** ppNewObj) = 0; }; @@ -4128,14 +4151,14 @@ XFLAIM uses to allow an application to embed a node source inside an XPATH component. ****************************************************************************/ - flminterface IF_QueryNodeSource : public F_Object + flminterface XFLEXP IF_QueryNodeSource : public F_Object { public: // Method that returns the search cost of this object in providing // nodes for a query. - virtual RCODE FLMAPI searchCost( + virtual RCODE XFLAPI searchCost( IF_Db * pDb, FLMBOOL bNotted, FLMUINT * puiCost, @@ -4143,7 +4166,7 @@ // Position to and return the first node that satisfies the predicate. - virtual RCODE FLMAPI getFirst( + virtual RCODE XFLAPI getFirst( IF_Db * pDb, IF_DOMNode * pContextNode, IF_DOMNode ** ppNode, @@ -4152,7 +4175,7 @@ // Position to and return the last node that satisfies the predicate. - virtual RCODE FLMAPI getLast( + virtual RCODE XFLAPI getLast( IF_Db * pDb, IF_DOMNode * pContextNode, IF_DOMNode ** ppNode, @@ -4163,7 +4186,7 @@ // If no prior positioning has been done, // position to and return the first node. - virtual RCODE FLMAPI getNext( + virtual RCODE XFLAPI getNext( IF_Db * pDb, IF_DOMNode * pContextNode, IF_DOMNode ** ppNode, @@ -4174,7 +4197,7 @@ // If no prior positioning has been done, // position to and return the last node. - virtual RCODE FLMAPI getPrev( + virtual RCODE XFLAPI getPrev( IF_Db * pDb, IF_DOMNode * pContextNode, IF_DOMNode ** ppNode, @@ -4183,16 +4206,16 @@ // Return index being used, 0 if none. - virtual RCODE FLMAPI getIndex( + virtual RCODE XFLAPI getIndex( IF_Db * pDb, FLMUINT * puiIndex, FLMBOOL * pbHaveMultiple) = 0; - virtual RCODE FLMAPI getOptInfoCount( + virtual RCODE XFLAPI getOptInfoCount( IF_Db * pDb, FLMUINT * puiOptInfoCount) = 0; - virtual RCODE FLMAPI getOptInfo( + virtual RCODE XFLAPI getOptInfo( IF_Db * pDb, XFLM_OPT_INFO * pOptInfoArray, FLMUINT uiNumOptInfoStructsToGet) = 0; @@ -4211,9 +4234,9 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_OperandComparer : public F_Object + flminterface XFLEXP IF_OperandComparer : public F_Object { - virtual RCODE FLMAPI compare( + virtual RCODE XFLAPI compare( IF_PosIStream * pLeftOperandStream, IF_PosIStream * pRightOperandStream, FLMINT * piCompare) = 0; @@ -4224,119 +4247,119 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_Query : public F_Object + flminterface XFLEXP IF_Query : public F_Object { - virtual RCODE FLMAPI setLanguage( + virtual RCODE XFLAPI setLanguage( FLMUINT uiLanguage) = 0; - virtual RCODE FLMAPI setCollection( + virtual RCODE XFLAPI setCollection( FLMUINT uiCollection) = 0; - virtual RCODE FLMAPI setupQueryExpr( + virtual RCODE XFLAPI setupQueryExpr( IF_Db * pDb, const FLMUNICODE * puzQuery) = 0; - virtual RCODE FLMAPI setupQueryExpr( + virtual RCODE XFLAPI setupQueryExpr( IF_Db * pDb, const char * pszQueryExpr) = 0; - virtual RCODE FLMAPI copyCriteria( + virtual RCODE XFLAPI copyCriteria( IF_Query * pSrcQuery) = 0; - virtual RCODE FLMAPI addXPathComponent( + virtual RCODE XFLAPI addXPathComponent( eXPathAxisTypes eXPathAxis, eDomNodeType eNodeType, FLMUINT uiNameId, IF_QueryNodeSource * pNodeSource = NULL) = 0; - virtual RCODE FLMAPI addOperator( + virtual RCODE XFLAPI addOperator( eQueryOperators eOperator, FLMUINT uiCompareRules = 0, IF_OperandComparer * pOpComparer = NULL) = 0; - virtual RCODE FLMAPI addUnicodeValue( + virtual RCODE XFLAPI addUnicodeValue( const FLMUNICODE * puzVal) = 0; - virtual RCODE FLMAPI addUTF8Value( + virtual RCODE XFLAPI addUTF8Value( const char * pszVal, FLMUINT uiUTF8Len = 0) = 0; - virtual RCODE FLMAPI addBinaryValue( + virtual RCODE XFLAPI addBinaryValue( const void * pvVal, FLMUINT uiValLen) = 0; - virtual RCODE FLMAPI addUINTValue( + virtual RCODE XFLAPI addUINTValue( FLMUINT uiVal) = 0; - virtual RCODE FLMAPI addINTValue( + virtual RCODE XFLAPI addINTValue( FLMINT iVal) = 0; - virtual RCODE FLMAPI addUINT64Value( + virtual RCODE XFLAPI addUINT64Value( FLMUINT64 ui64Val) = 0; - virtual RCODE FLMAPI addINT64Value( + virtual RCODE XFLAPI addINT64Value( FLMINT64 i64Val) = 0; - virtual RCODE FLMAPI addBoolean( + virtual RCODE XFLAPI addBoolean( FLMBOOL bVal, FLMBOOL bUnknown = FALSE) = 0; - virtual RCODE FLMAPI addFunction( + virtual RCODE XFLAPI addFunction( eQueryFunctions eFunction) = 0; - virtual RCODE FLMAPI addFunction( + virtual RCODE XFLAPI addFunction( IF_QueryValFunc * pFuncObj, FLMBOOL bHasXPathExpr) = 0; - virtual RCODE FLMAPI getFirst( + virtual RCODE XFLAPI getFirst( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit = 0) = 0; // milliseconds - virtual RCODE FLMAPI getLast( + virtual RCODE XFLAPI getLast( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit = 0) = 0; // milliseconds - virtual RCODE FLMAPI getNext( + virtual RCODE XFLAPI getNext( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit = 0, // milliseconds FLMUINT uiNumToSkip = 0, FLMUINT * puiNumSkipped = NULL) = 0; - virtual RCODE FLMAPI getPrev( + virtual RCODE XFLAPI getPrev( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit = 0, // milliseconds FLMUINT uiNumToSkip = 0, FLMUINT * puiNumSkipped = NULL) = 0; - virtual RCODE FLMAPI getCurrent( + virtual RCODE XFLAPI getCurrent( IF_Db * pDb, IF_DOMNode ** ppNode) = 0; - virtual void FLMAPI resetQuery( void) = 0; + virtual void XFLAPI resetQuery( void) = 0; - virtual RCODE FLMAPI getStatsAndOptInfo( + virtual RCODE XFLAPI getStatsAndOptInfo( FLMUINT * puiNumOptInfos, XFLM_OPT_INFO ** ppOptInfo) = 0; - virtual void FLMAPI freeStatsAndOptInfo( + virtual void XFLAPI freeStatsAndOptInfo( XFLM_OPT_INFO ** ppOptInfo) = 0; - virtual void FLMAPI setDupHandling( + virtual void XFLAPI setDupHandling( FLMBOOL bRemoveDups) = 0; - virtual RCODE FLMAPI setIndex( + virtual RCODE XFLAPI setIndex( FLMUINT uiIndex) = 0; - virtual RCODE FLMAPI getIndex( + virtual RCODE XFLAPI getIndex( IF_Db * pDb, FLMUINT * puiIndex, FLMBOOL * pbHaveMultiple) = 0; - virtual RCODE FLMAPI addSortKey( + virtual RCODE XFLAPI addSortKey( void * pvSortKeyContext, FLMBOOL bChildToContext, FLMBOOL bElement, @@ -4348,32 +4371,32 @@ FLMBOOL bSortMissingHigh, void ** ppvContext) = 0; - virtual RCODE FLMAPI enablePositioning( void) = 0; + virtual RCODE XFLAPI enablePositioning( void) = 0; - virtual RCODE FLMAPI positionTo( + virtual RCODE XFLAPI positionTo( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit, FLMUINT uiPosition) = 0; - virtual RCODE FLMAPI positionTo( + virtual RCODE XFLAPI positionTo( IF_Db * pDb, IF_DOMNode ** ppNode, FLMUINT uiTimeLimit, IF_DataVector * pSearchKey, FLMUINT uiFlags) = 0; - virtual RCODE FLMAPI getPosition( + virtual RCODE XFLAPI getPosition( IF_Db * pDb, FLMUINT * puiPosition) = 0; - virtual RCODE FLMAPI buildResultSet( + virtual RCODE XFLAPI buildResultSet( IF_Db * pDb, FLMUINT uiTimeLimit) = 0; - virtual void FLMAPI stopBuildingResultSet( void) = 0; + virtual void XFLAPI stopBuildingResultSet( void) = 0; - virtual RCODE FLMAPI getCounts( + virtual RCODE XFLAPI getCounts( IF_Db * pDb, FLMUINT uiTimeLimit, FLMBOOL bPartialCountOk, @@ -4382,12 +4405,12 @@ FLMUINT * puiPositionableToCount, FLMBOOL * pbDoneBuildingResultSet = NULL) = 0; - virtual void FLMAPI enableResultSetEncryption( void) = 0; + virtual void XFLAPI enableResultSetEncryption( void) = 0; - virtual void FLMAPI setQueryStatusObject( + virtual void XFLAPI setQueryStatusObject( IF_QueryStatus * pQueryStatus) = 0; - virtual void FLMAPI setQueryValidatorObject( + virtual void XFLAPI setQueryValidatorObject( IF_QueryValidator * pQueryValidator) = 0; }; @@ -4449,19 +4472,19 @@ /**************************************************************************** Desc: Node Info. Gatherer ****************************************************************************/ - flminterface IF_NodeInfo : public F_Object + flminterface XFLEXP IF_NodeInfo : public F_Object { - virtual void FLMAPI clearNodeInfo( void) = 0; + virtual void XFLAPI clearNodeInfo( void) = 0; - virtual RCODE FLMAPI addNodeInfo( + virtual RCODE XFLAPI addNodeInfo( IF_Db * pDb, IF_DOMNode * pNode, FLMBOOL bDoSubTree, FLMBOOL bDoSelf = TRUE) = 0; - virtual FLMUINT64 FLMAPI getTotalNodeCount( void) = 0; + virtual FLMUINT64 XFLAPI getTotalNodeCount( void) = 0; - virtual void FLMAPI getNodeInfo( + virtual void XFLAPI getNodeInfo( XFLM_NODE_INFO * pNodeInfo) = 0; }; @@ -4502,9 +4525,9 @@ /**************************************************************************** Desc: ****************************************************************************/ - flminterface IF_BTreeInfoStatus : public F_Object + flminterface XFLEXP IF_BTreeInfoStatus : public F_Object { - virtual RCODE FLMAPI infoStatus( + virtual RCODE XFLAPI infoStatus( FLMUINT uiCurrLfNum, FLMBOOL bIsCollection, char * pszCurrLfName, @@ -4517,42 +4540,42 @@ /**************************************************************************** Desc: BTree Info. Gatherer ****************************************************************************/ - flminterface IF_BTreeInfo : public F_Object + flminterface XFLEXP IF_BTreeInfo : public F_Object { - virtual void FLMAPI clearBTreeInfo( void) = 0; + virtual void XFLAPI clearBTreeInfo( void) = 0; - virtual RCODE FLMAPI collectIndexInfo( + virtual RCODE XFLAPI collectIndexInfo( IF_Db * pDb, FLMUINT uiIndexNum, IF_BTreeInfoStatus * pInfoStatus) = 0; - virtual RCODE FLMAPI collectCollectionInfo( + virtual RCODE XFLAPI collectCollectionInfo( IF_Db * pDb, FLMUINT uiCollectionNum, IF_BTreeInfoStatus * pInfoStatus) = 0; - virtual FLMUINT FLMAPI getNumIndexes( void) = 0; + virtual FLMUINT XFLAPI getNumIndexes( void) = 0; - virtual FLMUINT FLMAPI getNumCollections( void) = 0; + virtual FLMUINT XFLAPI getNumCollections( void) = 0; - virtual FLMBOOL FLMAPI getIndexInfo( + virtual FLMBOOL XFLAPI getIndexInfo( FLMUINT uiNthIndex, FLMUINT * puiIndexNum, char ** ppszIndexName, FLMUINT * puiNumLevels) = 0; - virtual FLMBOOL FLMAPI getCollectionInfo( + virtual FLMBOOL XFLAPI getCollectionInfo( FLMUINT uiNthCollection, FLMUINT * puiCollectionNum, char ** ppszCollectionName, FLMUINT * puiNumLevels) = 0; - virtual FLMBOOL FLMAPI getIndexLevelInfo( + virtual FLMBOOL XFLAPI getIndexLevelInfo( FLMUINT uiNthIndex, FLMUINT uiBTreeLevel, XFLM_BTREE_LEVEL_INFO * pLevelInfo) = 0; - virtual FLMBOOL FLMAPI getCollectionLevelInfo( + virtual FLMBOOL XFLAPI getCollectionLevelInfo( FLMUINT uiNthCollection, FLMUINT uiBTreeLevel, XFLM_BTREE_LEVEL_INFO * pLevelInfo) = 0; diff --git a/xflaim/util/checkdb.cpp b/xflaim/util/checkdb.cpp index 17abc54..1dd1a7b 100644 --- a/xflaim/util/checkdb.cpp +++ b/xflaim/util/checkdb.cpp @@ -87,10 +87,10 @@ public: m_uiLastRefresh = 0; } - RCODE FLMAPI reportProgress( + RCODE XFLAPI reportProgress( XFLM_PROGRESS_CHECK_INFO * pProgCheck); - RCODE FLMAPI reportCheckErr( + RCODE XFLAPI reportCheckErr( XFLM_CORRUPT_INFO * pCorruptInfo, FLMBOOL * pbFix); diff --git a/xflaim/util/fdomedt.cpp b/xflaim/util/fdomedt.cpp index b92b2a4..6049e35 100644 --- a/xflaim/util/fdomedt.cpp +++ b/xflaim/util/fdomedt.cpp @@ -556,18 +556,18 @@ public: } } - RCODE FLMAPI queryStatus( + RCODE XFLAPI queryStatus( XFLM_OPT_INFO * pOptInfo); - RCODE FLMAPI newSource( + RCODE XFLAPI newSource( XFLM_OPT_INFO * pOptInfo); - RCODE FLMAPI resultSetStatus( + RCODE XFLAPI resultSetStatus( FLMUINT64 ui64TotalDocsRead, FLMUINT64 ui64TotalDocsPassed, FLMBOOL bCanRetrieveDocs); - RCODE FLMAPI resultSetComplete( + RCODE XFLAPI resultSetComplete( FLMUINT64 ui64TotalDocsRead, FLMUINT64 ui64TotalDocsPassed); @@ -598,17 +598,17 @@ public: FLMUINT64 ui64TotalDocsPassed, FLMBOOL bCanRetrieveDocs); - FINLINE FLMINT FLMAPI getRefCount( void) + FINLINE FLMINT XFLAPI getRefCount( void) { return( IF_QueryStatus::getRefCount()); } - virtual FINLINE FLMINT FLMAPI AddRef( void) + virtual FINLINE FLMINT XFLAPI AddRef( void) { return( IF_QueryStatus::AddRef()); } - virtual FINLINE FLMINT FLMAPI Release( void) + virtual FINLINE FLMINT XFLAPI Release( void) { return( IF_QueryStatus::Release()); } @@ -1083,7 +1083,7 @@ Exit: /**************************************************************************** Desc: Query status callback *****************************************************************************/ -RCODE FLMAPI EditQueryStatus::resultSetStatus( +RCODE XFLAPI EditQueryStatus::resultSetStatus( FLMUINT64 ui64TotalDocsRead, FLMUINT64 ui64TotalDocsPassed, FLMBOOL bCanRetrieveDocs) @@ -1111,7 +1111,7 @@ Exit: /**************************************************************************** Desc: Query status callback *****************************************************************************/ -RCODE FLMAPI EditQueryStatus::resultSetComplete( +RCODE XFLAPI EditQueryStatus::resultSetComplete( FLMUINT64 ui64TotalDocsRead, FLMUINT64 ui64TotalDocsPassed) { diff --git a/xflaim/util/flm_lutl.cpp b/xflaim/util/flm_lutl.cpp index 68b4acd..4db3035 100644 --- a/xflaim/util/flm_lutl.cpp +++ b/xflaim/util/flm_lutl.cpp @@ -144,7 +144,7 @@ public: { } - void FLMAPI catchEvent( + void XFLAPI catchEvent( eEventType eEvent, IF_Db * pDb, FLMUINT uiThreadId, @@ -202,7 +202,7 @@ Desc: Thread that displays the current status of all indexes in a database Note: The caller must open the database and pass a handle to the thread. The handle will be closed when the thread exits. *****************************************************************************/ -RCODE FLMAPI flstIndexManagerThread( +RCODE FTKAPI flstIndexManagerThread( IF_Thread * pThread) { RCODE rc = NE_XFLM_OK; @@ -836,7 +836,7 @@ Name: flstMemoryManagerThread Desc: Thread that displays the current status of a database's cache Note: The caller must pass a valid share handle to the thread on startup. *****************************************************************************/ -RCODE FLMAPI flstMemoryManagerThread( +RCODE FTKAPI flstMemoryManagerThread( IF_Thread * pThread) { RCODE rc = NE_XFLM_OK; diff --git a/xflaim/util/flm_lutl.h b/xflaim/util/flm_lutl.h index bd258d0..514dc50 100644 --- a/xflaim/util/flm_lutl.h +++ b/xflaim/util/flm_lutl.h @@ -23,8 +23,8 @@ // $Id$ //------------------------------------------------------------------------------ -RCODE FLMAPI flstIndexManagerThread( +RCODE FTKAPI flstIndexManagerThread( IF_Thread * pThread); -RCODE FLMAPI flstMemoryManagerThread( +RCODE FTKAPI flstMemoryManagerThread( IF_Thread * pThread); diff --git a/xflaim/util/fshell.cpp b/xflaim/util/fshell.cpp index 96521d6..31d593f 100644 --- a/xflaim/util/fshell.cpp +++ b/xflaim/util/fshell.cpp @@ -327,13 +327,13 @@ public: pszBackupSetPath, pszRflDir)); } - FINLINE RCODE FLMAPI openRflFile( + FINLINE RCODE XFLAPI openRflFile( FLMUINT uiFileNum) { return( F_FSRestore::openRflFile( uiFileNum)); } - FINLINE RCODE FLMAPI read( + FINLINE RCODE XFLAPI read( FLMUINT uiLength, void * pvBuffer, FLMUINT * puiBytesRead) @@ -367,28 +367,28 @@ public: m_ui64RflBytesRead = 0; } - RCODE FLMAPI reportProgress( + RCODE XFLAPI reportProgress( eRestoreAction * peAction, FLMUINT64 ui64BytesToDo, FLMUINT64 ui64BytesDone); - RCODE FLMAPI reportError( + RCODE XFLAPI reportError( eRestoreAction * peAction, RCODE rcErr); - RCODE FLMAPI reportBeginTrans( + RCODE XFLAPI reportBeginTrans( eRestoreAction * peAction, FLMUINT64 ui64TransId); - RCODE FLMAPI reportCommitTrans( + RCODE XFLAPI reportCommitTrans( eRestoreAction * peAction, FLMUINT64 ui64TransId); - RCODE FLMAPI reportAbortTrans( + RCODE XFLAPI reportAbortTrans( eRestoreAction * peAction, FLMUINT64 ui64TransId); - RCODE FLMAPI reportOpenRflFile( + RCODE XFLAPI reportOpenRflFile( eRestoreAction * peAction, FLMUINT uiFileNum) { @@ -399,7 +399,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportRflRead( + RCODE XFLAPI reportRflRead( eRestoreAction * peAction, FLMUINT uiFileNum, FLMUINT uiBytesRead) @@ -412,7 +412,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportBlockChainFree( + RCODE XFLAPI reportBlockChainFree( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT64, // ui64MaintDocNum, @@ -425,15 +425,15 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportEnableEncryption( + RCODE XFLAPI reportEnableEncryption( eRestoreAction * peAction, FLMUINT64 ui64TransId); - RCODE FLMAPI reportWrapKey( + RCODE XFLAPI reportWrapKey( eRestoreAction * peAction, FLMUINT64 ui64TransId); - RCODE FLMAPI reportRollOverDbKey( + RCODE XFLAPI reportRollOverDbKey( eRestoreAction * peAction, FLMUINT64) // ui64TransId) { @@ -441,7 +441,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportDocumentDone( + RCODE XFLAPI reportDocumentDone( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -451,7 +451,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportNodeCreate( + RCODE XFLAPI reportNodeCreate( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -464,7 +464,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportNodeDelete( + RCODE XFLAPI reportNodeDelete( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -474,7 +474,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportNodeChildrenDelete( + RCODE XFLAPI reportNodeChildrenDelete( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -485,7 +485,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportInsertBefore( + RCODE XFLAPI reportInsertBefore( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -497,7 +497,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportNodeUpdate( + RCODE XFLAPI reportNodeUpdate( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -507,7 +507,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportNodeSetValue( + RCODE XFLAPI reportNodeSetValue( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -517,7 +517,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportNodeFlagsUpdate( + RCODE XFLAPI reportNodeFlagsUpdate( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -529,7 +529,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportNodeSetPrefixId( + RCODE XFLAPI reportNodeSetPrefixId( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -540,7 +540,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportSetNextNodeId( + RCODE XFLAPI reportSetNextNodeId( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -550,7 +550,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportNodeSetMetaValue( + RCODE XFLAPI reportNodeSetMetaValue( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -562,7 +562,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportAttributeDelete( + RCODE XFLAPI reportAttributeDelete( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -573,7 +573,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportAttributeSetValue( + RCODE XFLAPI reportAttributeSetValue( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -584,7 +584,7 @@ public: return( NE_XFLM_OK); } - RCODE FLMAPI reportNodeSetPrefixId( + RCODE XFLAPI reportNodeSetPrefixId( eRestoreAction * peAction, FLMUINT64, // ui64TransId, FLMUINT, // uiCollection, @@ -649,21 +649,21 @@ public: m_pShell = pShell; } - RCODE FLMAPI backupStatus( + RCODE XFLAPI backupStatus( FLMUINT64 ui64BytesToDo, FLMUINT64 ui64BytesDone); - FINLINE FLMINT FLMAPI getRefCount( void) + FINLINE FLMINT XFLAPI getRefCount( void) { return( IF_BackupStatus::getRefCount()); } - virtual FINLINE FLMINT FLMAPI AddRef( void) + virtual FINLINE FLMINT XFLAPI AddRef( void) { return( IF_BackupStatus::AddRef()); } - virtual FINLINE FLMINT FLMAPI Release( void) + virtual FINLINE FLMINT XFLAPI Release( void) { return( IF_BackupStatus::Release()); } @@ -2298,7 +2298,7 @@ public: { } - RCODE FLMAPI dbCopyStatus( + RCODE XFLAPI dbCopyStatus( FLMUINT64 ui64BytesToCopy, FLMUINT64 ui64BytesCopied, FLMBOOL bNewSrcFile, @@ -2362,7 +2362,7 @@ public: { } - FINLINE RCODE FLMAPI dbRenameStatus( + FINLINE RCODE XFLAPI dbRenameStatus( const char * pszSrcFileName, const char * pszDstFileName) { @@ -7953,7 +7953,7 @@ public: { } - RCODE FLMAPI infoStatus( + RCODE XFLAPI infoStatus( FLMUINT uiCurrLfNum, FLMBOOL bIsCollection, char * pszCurrLfName, @@ -8025,7 +8025,7 @@ private: Desc: Callback function that is called while gathering data on an index or collection. *****************************************************************************/ -RCODE FLMAPI SH_BTreeInfoStatus::infoStatus( +RCODE XFLAPI SH_BTreeInfoStatus::infoStatus( FLMUINT uiCurrLfNum, FLMBOOL bIsCollection, char * pszCurrLfName, diff --git a/xflaim/util/rebuild.cpp b/xflaim/util/rebuild.cpp index 1d4f5b4..336c091 100644 --- a/xflaim/util/rebuild.cpp +++ b/xflaim/util/rebuild.cpp @@ -57,10 +57,10 @@ public: { } - RCODE FLMAPI reportRebuild( + RCODE XFLAPI reportRebuild( XFLM_REBUILD_INFO * pRebuild); - RCODE FLMAPI reportRebuildErr( + RCODE XFLAPI reportRebuildErr( XFLM_CORRUPT_INFO * pCorruptInfo); private: diff --git a/xflaim/util/sharutil.cpp b/xflaim/util/sharutil.cpp index 7ab499c..878f0c7 100644 --- a/xflaim/util/sharutil.cpp +++ b/xflaim/util/sharutil.cpp @@ -26,7 +26,7 @@ #include "flaimsys.h" #include "sharutil.h" -FSTATIC RCODE FLMAPI _flmWrapperFunc( +FSTATIC RCODE FTKAPI _flmWrapperFunc( IF_Thread * pThread); /******************************************************************** @@ -968,7 +968,7 @@ RCODE FlmSharedContext::getThread( /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI _flmWrapperFunc( +RCODE FTKAPI _flmWrapperFunc( IF_Thread * pFlmThread) { FlmThreadContext * pThread = (FlmThreadContext *)pFlmThread->getParm1(); diff --git a/xflaim/win32/xflaim/unittests/ut_basictest/ut_basictest.vcproj b/xflaim/win32/xflaim/unittests/ut_basictest/ut_basictest.vcproj index 3691e22..de2e288 100644 --- a/xflaim/win32/xflaim/unittests/ut_basictest/ut_basictest.vcproj +++ b/xflaim/win32/xflaim/unittests/ut_basictest/ut_basictest.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;FLM_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)" StringPooling="true" MinimalRebuild="false" BasicRuntimeChecks="3" @@ -64,7 +64,7 @@ />