diff --git a/xflaim/java/jni/jdbsystem.cpp b/xflaim/java/jni/jdbsystem.cpp index 73e2eb1..cfdb785 100644 --- a/xflaim/java/jni/jdbsystem.cpp +++ b/xflaim/java/jni/jdbsystem.cpp @@ -894,19 +894,19 @@ FSTATIC void getCreateOpts( jobject createOpts, XFLM_CREATE_OPTS * pCreateOpts) { - pCreateOpts->uiBlockSize = (FLMUINT)pEnv->GetIntField( createOpts, + pCreateOpts->ui32BlockSize = (FLMUINT32)pEnv->GetIntField( createOpts, fid_CREATEOPTS_iBlockSize); - pCreateOpts->uiVersionNum = (FLMUINT)pEnv->GetIntField( createOpts, + pCreateOpts->ui32VersionNum = (FLMUINT32)pEnv->GetIntField( createOpts, fid_CREATEOPTS_iVersionNum); - pCreateOpts->uiMinRflFileSize = (FLMUINT)pEnv->GetIntField( createOpts, + pCreateOpts->ui32MinRflFileSize = (FLMUINT32)pEnv->GetIntField( createOpts, fid_CREATEOPTS_iMinRflFileSize); - pCreateOpts->uiMaxRflFileSize = (FLMUINT)pEnv->GetIntField( createOpts, + pCreateOpts->ui32MaxRflFileSize = (FLMUINT32)pEnv->GetIntField( createOpts, fid_CREATEOPTS_iMaxRflFileSize); - pCreateOpts->bKeepRflFiles = (FLMBOOL)(pEnv->GetBooleanField( createOpts, + pCreateOpts->i32KeepRflFiles = (FLMINT32)(pEnv->GetBooleanField( createOpts, fid_CREATEOPTS_bKeepRflFiles) ? TRUE : FALSE); - pCreateOpts->bLogAbortedTransToRfl = (FLMBOOL)(pEnv->GetBooleanField( createOpts, + pCreateOpts->i32LogAbortedTransToRfl = (FLMINT32)(pEnv->GetBooleanField( createOpts, fid_CREATEOPTS_bLogAbortedTransToRfl) ? TRUE : FALSE); - pCreateOpts->uiDefaultLanguage = (FLMUINT)pEnv->GetIntField( createOpts, + pCreateOpts->ui32DefaultLanguage = (FLMUINT32)pEnv->GetIntField( createOpts, fid_CREATEOPTS_iDefaultLanguage); } diff --git a/xflaim/src/ffilehdr.cpp b/xflaim/src/ffilehdr.cpp index 2e75f9a..1b8194e 100644 --- a/xflaim/src/ffilehdr.cpp +++ b/xflaim/src/ffilehdr.cpp @@ -70,23 +70,23 @@ void flmInitDbHdr( if (pCreateOpts) { - pDbHdr->ui16BlockSize = (FLMUINT16)pCreateOpts->uiBlockSize; - pDbHdr->ui8DefaultLanguage = (FLMUINT8)pCreateOpts->uiDefaultLanguage; - if (pCreateOpts->bKeepRflFiles) + pDbHdr->ui16BlockSize = (FLMUINT16)pCreateOpts->ui32BlockSize; + pDbHdr->ui8DefaultLanguage = (FLMUINT8)pCreateOpts->ui32DefaultLanguage; + if (pCreateOpts->i32KeepRflFiles) { pDbHdr->ui8RflKeepFiles = 1; } - if (pCreateOpts->bLogAbortedTransToRfl) + if (pCreateOpts->i32LogAbortedTransToRfl) { pDbHdr->ui8RflKeepAbortedTrans = 1; } - if( (uiMinRflFileSize = pCreateOpts->uiMinRflFileSize) == 0) + if( (uiMinRflFileSize = (FLMUINT)pCreateOpts->ui32MinRflFileSize) == 0) { uiMinRflFileSize = XFLM_DEFAULT_MIN_RFL_FILE_SIZE; } - if( (uiMaxRflFileSize = pCreateOpts->uiMaxRflFileSize) == 0) + if( (uiMaxRflFileSize = (FLMUINT)pCreateOpts->ui32MaxRflFileSize) == 0) { uiMaxRflFileSize = XFLM_DEFAULT_MAX_RFL_FILE_SIZE; } diff --git a/xflaim/src/flblddb.cpp b/xflaim/src/flblddb.cpp index 94e39e4..b8b66c4 100644 --- a/xflaim/src/flblddb.cpp +++ b/xflaim/src/flblddb.cpp @@ -535,7 +535,7 @@ Retry: // Set block size to zero, so we will always take the calculated // block size below. - m_createOpts.uiBlockSize = 0; + m_createOpts.ui32BlockSize = 0; pCreateOpts = &m_createOpts; } @@ -546,8 +546,8 @@ Retry: goto Exit; } - uiSaveBlockSize = pCreateOpts->uiBlockSize; - pCreateOpts->uiBlockSize = uiCalcBlockSize; + uiSaveBlockSize = pCreateOpts->ui32BlockSize; + pCreateOpts->ui32BlockSize = (FLMUINT32)uiCalcBlockSize; // Initialize the database header to useable values. @@ -558,7 +558,7 @@ Retry: if( uiSaveBlockSize) { - pCreateOpts->uiBlockSize = uiSaveBlockSize; + pCreateOpts->ui32BlockSize = (FLMUINT32)uiSaveBlockSize; } } else @@ -629,9 +629,9 @@ Retry: // If no block size has been specified or determined yet, use what we // read from the database header. - if( !pCreateOpts->uiBlockSize) + if( !pCreateOpts->ui32BlockSize) { - pCreateOpts->uiBlockSize = m_dbHdr.ui16BlockSize; + pCreateOpts->ui32BlockSize = (FLMUINT32)m_dbHdr.ui16BlockSize; } // Create the destination database @@ -1811,28 +1811,28 @@ FSTATIC void flmGetCreateOpts( f_memset( pCreateOpts, 0, sizeof( XFLM_CREATE_OPTS)); if( pDbHdr) { - pCreateOpts->uiBlockSize = pDbHdr->ui16BlockSize; - pCreateOpts->uiVersionNum = pDbHdr->ui32DbVersion; - pCreateOpts->uiDefaultLanguage = pDbHdr->ui8DefaultLanguage; - pCreateOpts->uiMinRflFileSize = pDbHdr->ui32RflMinFileSize; - pCreateOpts->uiMaxRflFileSize = pDbHdr->ui32RflMaxFileSize; - pCreateOpts->bKeepRflFiles = (FLMBOOL)(pDbHdr->ui8RflKeepFiles + pCreateOpts->ui32BlockSize = (FLMUINT32)pDbHdr->ui16BlockSize; + pCreateOpts->ui32VersionNum = pDbHdr->ui32DbVersion; + pCreateOpts->ui32DefaultLanguage = pDbHdr->ui8DefaultLanguage; + pCreateOpts->ui32MinRflFileSize = pDbHdr->ui32RflMinFileSize; + pCreateOpts->ui32MaxRflFileSize = pDbHdr->ui32RflMaxFileSize; + pCreateOpts->i32KeepRflFiles = (FLMINT32)(pDbHdr->ui8RflKeepFiles ? TRUE : FALSE); - pCreateOpts->bLogAbortedTransToRfl = - (FLMBOOL)(pDbHdr->ui8RflKeepAbortedTrans + pCreateOpts->i32LogAbortedTransToRfl = + (FLMINT32)(pDbHdr->ui8RflKeepAbortedTrans ? TRUE : FALSE); } else { - pCreateOpts->uiBlockSize = XFLM_DEFAULT_BLKSIZ; - pCreateOpts->uiVersionNum = XFLM_CURRENT_VERSION_NUM; - pCreateOpts->uiDefaultLanguage = XFLM_DEFAULT_LANG; - pCreateOpts->uiMinRflFileSize = XFLM_DEFAULT_MIN_RFL_FILE_SIZE; - pCreateOpts->uiMaxRflFileSize = XFLM_DEFAULT_MAX_RFL_FILE_SIZE; - pCreateOpts->bKeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG; - pCreateOpts->bLogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG; + pCreateOpts->ui32BlockSize = XFLM_DEFAULT_BLKSIZ; + pCreateOpts->ui32VersionNum = XFLM_CURRENT_VERSION_NUM; + pCreateOpts->ui32DefaultLanguage = XFLM_DEFAULT_LANG; + pCreateOpts->ui32MinRflFileSize = XFLM_DEFAULT_MIN_RFL_FILE_SIZE; + pCreateOpts->ui32MaxRflFileSize = XFLM_DEFAULT_MAX_RFL_FILE_SIZE; + pCreateOpts->i32KeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG; + pCreateOpts->i32LogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG; } } diff --git a/xflaim/src/flcreate.cpp b/xflaim/src/flcreate.cpp index fe337c2..e0a9a20 100644 --- a/xflaim/src/flcreate.cpp +++ b/xflaim/src/flcreate.cpp @@ -288,7 +288,7 @@ RCODE F_Db::initDbFiles( // Determine what size of buffer to allocate. uiBlkSize = (FLMUINT)(pCreateOpts - ? flmAdjustBlkSize( pCreateOpts->uiBlockSize) + ? flmAdjustBlkSize( (FLMUINT)pCreateOpts->ui32BlockSize) : (FLMUINT)XFLM_DEFAULT_BLKSIZ); // Allocate a buffer for writing. diff --git a/xflaim/src/xflaim.h b/xflaim/src/xflaim.h index 8fed865..1fa7057 100644 --- a/xflaim/src/xflaim.h +++ b/xflaim/src/xflaim.h @@ -81,25 +81,27 @@ Desc: This structure is used as a parameter to dbCreate to specify the create options for a database. It is also optionally returned when calling dbOpen. + IMPORTANT NOTE: This needs to be kept in sync with the same + structure that is defined in java and csharp modules. ****************************************************************************/ typedef struct { - FLMUINT uiBlockSize; + FLMUINT32 ui32BlockSize; #define XFLM_DEFAULT_BLKSIZ 4096 - FLMUINT uiVersionNum; + FLMUINT32 ui32VersionNum; #define XFLM_VER_5_12 512 #define XFLM_CURRENT_VERSION_NUM XFLM_VER_5_12 #define XFLM_CURRENT_VER_STR "5.12" - FLMUINT uiMinRflFileSize; + FLMUINT32 ui32MinRflFileSize; #define XFLM_DEFAULT_MIN_RFL_FILE_SIZE ((FLMUINT)100 * (FLMUINT)1024 * (FLMUINT)1024) - FLMUINT uiMaxRflFileSize; + FLMUINT32 ui32MaxRflFileSize; #define XFLM_DEFAULT_MAX_RFL_FILE_SIZE FLM_MAXIMUM_FILE_SIZE - FLMBOOL bKeepRflFiles; + FLMINT32 i32KeepRflFiles; #define XFLM_DEFAULT_KEEP_RFL_FILES_FLAG FALSE - FLMBOOL bLogAbortedTransToRfl; + FLMINT32 i32LogAbortedTransToRfl; #define XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG FALSE - FLMUINT uiDefaultLanguage; + FLMUINT32 ui32DefaultLanguage; #define XFLM_DEFAULT_LANG (FLM_US_LANG) } XFLM_CREATE_OPTS, F_CREATE_OPTS; diff --git a/xflaim/util/rebuild.cpp b/xflaim/util/rebuild.cpp index 866fbae..ef3bd3c 100644 --- a/xflaim/util/rebuild.cpp +++ b/xflaim/util/rebuild.cpp @@ -143,7 +143,7 @@ static FLMUINT gv_uiCacheSize = 30000; static IF_FileHdl * gv_pLogFile; static FLMBOOL gv_bLoggingEnabled; static char * gv_pszDictPath; -static XFLM_CREATE_OPTS gv_DefaultCreateOpts; +static XFLM_CREATE_OPTS gv_DefaultCreateOpts; static FLMBOOL gv_bFixHdrInfo; static FLMBOOL gv_bRunning; static FLMBOOL gv_bPauseBeforeExiting = FALSE; @@ -519,13 +519,13 @@ FSTATIC FLMBOOL bldGetParams( gv_szDictFileName [0] = 0; gv_szLogFileName [0] = 0; gv_bFixHdrInfo = FALSE; - gv_DefaultCreateOpts.uiBlockSize = XFLM_DEFAULT_BLKSIZ; - gv_DefaultCreateOpts.uiMinRflFileSize = XFLM_DEFAULT_MIN_RFL_FILE_SIZE; - gv_DefaultCreateOpts.uiMaxRflFileSize = XFLM_DEFAULT_MAX_RFL_FILE_SIZE; - gv_DefaultCreateOpts.bKeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG; - gv_DefaultCreateOpts.bLogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG; - gv_DefaultCreateOpts.uiDefaultLanguage = XFLM_DEFAULT_LANG; - gv_DefaultCreateOpts.uiVersionNum = XFLM_CURRENT_VERSION_NUM; + gv_DefaultCreateOpts.ui32BlockSize = XFLM_DEFAULT_BLKSIZ; + gv_DefaultCreateOpts.ui32MinRflFileSize = XFLM_DEFAULT_MIN_RFL_FILE_SIZE; + gv_DefaultCreateOpts.ui32MaxRflFileSize = XFLM_DEFAULT_MAX_RFL_FILE_SIZE; + gv_DefaultCreateOpts.i32KeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG; + gv_DefaultCreateOpts.i32LogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG; + gv_DefaultCreateOpts.ui32DefaultLanguage = XFLM_DEFAULT_LANG; + gv_DefaultCreateOpts.ui32VersionNum = XFLM_CURRENT_VERSION_NUM; gv_uiCacheSize = 30000; gv_bBatchMode = FALSE; gv_szPassword [0] = 0; @@ -826,19 +826,19 @@ FSTATIC FLMBOOL bldParseHdrInfo( bldShowError( "Illegal block size"); return( FALSE); } - CreateOpts.uiBlockSize = uiNum; + CreateOpts.ui32BlockSize = (FLMUINT32)uiNum; break; case 2: - CreateOpts.uiMinRflFileSize = uiNum; + CreateOpts.ui32MinRflFileSize = (FLMUINT32)uiNum; break; case 3: - CreateOpts.uiMaxRflFileSize = uiNum; + CreateOpts.ui32MaxRflFileSize = (FLMUINT32)uiNum; break; case 4: - CreateOpts.uiDefaultLanguage = uiNum; + CreateOpts.ui32DefaultLanguage = (FLMUINT32)uiNum; break; case 5: - CreateOpts.uiVersionNum = uiNum; + CreateOpts.ui32VersionNum = (FLMUINT32)uiNum; break; default: bldShowError( "Too many parameters in header information"); diff --git a/xflaim/util/view.cpp b/xflaim/util/view.cpp index 1eec967..70fee3d 100644 --- a/xflaim/util/view.cpp +++ b/xflaim/util/view.cpp @@ -86,13 +86,13 @@ extern "C" int main( // Setup defaults for fixing the file header if necessary - gv_ViewFixOptions.uiBlockSize = XFLM_DEFAULT_BLKSIZ; - gv_ViewFixOptions.uiVersionNum = XFLM_CURRENT_VERSION_NUM; - gv_ViewFixOptions.uiMinRflFileSize = XFLM_DEFAULT_MIN_RFL_FILE_SIZE; - gv_ViewFixOptions.uiMaxRflFileSize = XFLM_DEFAULT_MAX_RFL_FILE_SIZE; - gv_ViewFixOptions.bKeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG; - gv_ViewFixOptions.bLogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG; - gv_ViewFixOptions.uiDefaultLanguage = XFLM_DEFAULT_LANG; + gv_ViewFixOptions.ui32BlockSize = XFLM_DEFAULT_BLKSIZ; + gv_ViewFixOptions.ui32VersionNum = XFLM_CURRENT_VERSION_NUM; + gv_ViewFixOptions.ui32MinRflFileSize = XFLM_DEFAULT_MIN_RFL_FILE_SIZE; + gv_ViewFixOptions.ui32MaxRflFileSize = XFLM_DEFAULT_MAX_RFL_FILE_SIZE; + gv_ViewFixOptions.i32KeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG; + gv_ViewFixOptions.i32LogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG; + gv_ViewFixOptions.ui32DefaultLanguage = XFLM_DEFAULT_LANG; // See if a file name was passed in @@ -160,8 +160,8 @@ extern "C" int main( break; case 'b': case 'B': - gv_ViewFixOptions.uiBlockSize = - f_atoi( &ppszArgV [uiArg][2]); + gv_ViewFixOptions.ui32BlockSize = + (FLMUINT32)f_atoi( &ppszArgV [uiArg][2]); break; case 'd': case 'D': @@ -181,13 +181,13 @@ extern "C" int main( break; case 'l': case 'L': - gv_ViewFixOptions.uiMaxRflFileSize = - f_atol( &ppszArgV [uiArg][2]); + gv_ViewFixOptions.ui32MaxRflFileSize = + (FLMUINT32)f_atol( &ppszArgV [uiArg][2]); break; case 'm': case 'M': - gv_ViewFixOptions.uiMinRflFileSize = - f_atol( &ppszArgV [uiArg][2]); + gv_ViewFixOptions.ui32MinRflFileSize = + (FLMUINT32)f_atol( &ppszArgV [uiArg][2]); break; case 'p': case 'P':