From 58d3a275e7c9994a9a73345d5bf603ae9c2de289 Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Thu, 7 Sep 2006 18:50:49 +0000 Subject: [PATCH] XFLAIM changes. Fixed compiler warnings on Windows. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@822 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- xflaim/java/jni/jbackup.cpp | 2 +- xflaim/java/jni/jdatavector.cpp | 4 +-- xflaim/java/jni/jdb.cpp | 56 ++++++++++++++++----------------- xflaim/java/jni/jdbsystem.cpp | 2 +- xflaim/util/view.cpp | 4 +-- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/xflaim/java/jni/jbackup.cpp b/xflaim/java/jni/jbackup.cpp index b9c4c2e..4656c06 100644 --- a/xflaim/java/jni/jbackup.cpp +++ b/xflaim/java/jni/jbackup.cpp @@ -261,7 +261,7 @@ JNIEXPORT jlong JNICALL Java_xflaim_Backup__1backup( IF_Backup * pBackup = THIS_BACKUP(); FLMUINT uiSeqNum = 0; JavaVM * pJvm; - JNIBackupClient * pClient; + JNIBackupClient * pClient = NULL; JNIBackupStatus * pStatus = NULL; FLMBYTE ucBackupPath [F_PATH_MAX_SIZE]; F_DynaBuf backupPathBuf( ucBackupPath, sizeof( ucBackupPath)); diff --git a/xflaim/java/jni/jdatavector.cpp b/xflaim/java/jni/jdatavector.cpp index abb4ab3..ff179b9 100644 --- a/xflaim/java/jni/jdatavector.cpp +++ b/xflaim/java/jni/jdatavector.cpp @@ -501,7 +501,7 @@ JNIEXPORT jbyteArray JNICALL Java_xflaim_DataVector__1outputKey( RCODE rc = NE_XFLM_OK; IF_Db * pDb = (IF_Db *)(FLMUINT)ljDbRef; FLMUINT uiLength; - jbyteArray Key; + jbyteArray Key = NULL; void * pvKey = NULL; jboolean bIsCopy = false; FLMBOOL bMustRelease = false; @@ -559,7 +559,7 @@ JNIEXPORT jbyteArray JNICALL Java_xflaim_DataVector__1outputData( RCODE rc = NE_XFLM_OK; IF_Db * pDb = (IF_Db *)(FLMUINT)ljDbRef; FLMUINT uiLength = 0; - jbyteArray Data; + jbyteArray Data = NULL; void * pvData = NULL; jboolean bIsCopy = false; FLMBOOL bMustRelease = false; diff --git a/xflaim/java/jni/jdb.cpp b/xflaim/java/jni/jdb.cpp index 8a750d8..f9dfdf5 100644 --- a/xflaim/java/jni/jdb.cpp +++ b/xflaim/java/jni/jdb.cpp @@ -430,7 +430,7 @@ Exit: Desc: ****************************************************************************/ JNIEXPORT jint JNICALL Java_xflaim_Db__1getTransType( - JNIEnv * pEnv, + JNIEnv *, // pEnv, jobject, // obj, jlong lThis) { @@ -1145,7 +1145,7 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getElementNameId( { RCODE rc = NE_XFLM_OK; IF_Db * pDb = THIS_FDB(); - FLMUINT uiNameId; + FLMUINT uiNameId = 0; FLMBYTE ucNamespaceBuf [200]; FLMBYTE ucElementNameBuf [200]; F_DynaBuf namespaceURI( ucNamespaceBuf, sizeof( ucNamespaceBuf)); @@ -1240,7 +1240,7 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getAttributeNameId( { RCODE rc = NE_XFLM_OK; IF_Db * pDb = THIS_FDB(); - FLMUINT uiNameId; + FLMUINT uiNameId = 0; FLMBYTE ucNamespaceBuf [200]; FLMBYTE ucAttributeNameBuf [200]; F_DynaBuf namespaceURI( ucNamespaceBuf, sizeof( ucNamespaceBuf)); @@ -1320,7 +1320,7 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getPrefixId( { RCODE rc = NE_XFLM_OK; IF_Db * pDb = THIS_FDB(); - FLMUINT uiNameId; + FLMUINT uiNameId = 0; FLMBYTE ucPrefixNameBuf [200]; F_DynaBuf prefixName( ucPrefixNameBuf, sizeof( ucPrefixNameBuf)); @@ -1400,7 +1400,7 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getEncDefId( { RCODE rc = NE_XFLM_OK; IF_Db * pDb = THIS_FDB(); - FLMUINT uiNameId; + FLMUINT uiNameId = 0; FLMBYTE ucEncNameBuf [200]; F_DynaBuf encName( ucEncNameBuf, sizeof( ucEncNameBuf)); @@ -1467,11 +1467,11 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getCollectionNumber( jlong lThis, jstring sCollectionName) { - RCODE rc = NE_XFLM_OK; - IF_Db * pDb = THIS_FDB(); - FLMUINT uiNameId; - FLMBYTE ucCollectionNameBuf [200]; - F_DynaBuf collectionName( ucCollectionNameBuf, sizeof( ucCollectionNameBuf)); + RCODE rc = NE_XFLM_OK; + IF_Db * pDb = THIS_FDB(); + FLMUINT uiNameId = 0; + FLMBYTE ucCollectionNameBuf [200]; + F_DynaBuf collectionName( ucCollectionNameBuf, sizeof( ucCollectionNameBuf)); flmAssert( sCollectionName); if (RC_BAD( rc = getUniString( pEnv, sCollectionName, &collectionName))) @@ -1501,11 +1501,11 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getIndexNumber( jlong lThis, jstring sIndexName) { - RCODE rc = NE_XFLM_OK; - IF_Db * pDb = THIS_FDB(); - FLMUINT uiNameId; - FLMBYTE ucIndexNameBuf [200]; - F_DynaBuf indexName( ucIndexNameBuf, sizeof( ucIndexNameBuf)); + RCODE rc = NE_XFLM_OK; + IF_Db * pDb = THIS_FDB(); + FLMUINT uiNameId = 0; + FLMBYTE ucIndexNameBuf [200]; + F_DynaBuf indexName( ucIndexNameBuf, sizeof( ucIndexNameBuf)); flmAssert( sIndexName); if (RC_BAD( rc = getUniString( pEnv, sIndexName, &indexName))) @@ -1847,10 +1847,10 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getDataType( jint iDictType, jint iDictNumber) { - RCODE rc = NE_XFLM_OK; - IF_Db * pDb = THIS_FDB(); - FLMUINT uiDataType; - FLMUINT uiDictType = 0; + RCODE rc = NE_XFLM_OK; + IF_Db * pDb = THIS_FDB(); + FLMUINT uiDataType = 0; + FLMUINT uiDictType = 0; if (RC_BAD( rc = mapDictType( iDictType, &uiDictType))) { @@ -2416,7 +2416,7 @@ Exit: Desc: ****************************************************************************/ JNIEXPORT void JNICALL Java_xflaim_Db__1setFileExtendSize( - JNIEnv * pEnv, + JNIEnv *, // pEnv, jobject, // obj, jlong lThis, jint iFileExtendSize) @@ -2431,7 +2431,7 @@ JNIEXPORT void JNICALL Java_xflaim_Db__1setFileExtendSize( Desc: ****************************************************************************/ JNIEXPORT jint JNICALL Java_xflaim_Db__1getFileExtendSize( - JNIEnv * pEnv, + JNIEnv *, // pEnv, jobject, // obj, jlong lThis) { @@ -2444,7 +2444,7 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getFileExtendSize( Desc: ****************************************************************************/ JNIEXPORT jint JNICALL Java_xflaim_Db__1getDbVersion( - JNIEnv * pEnv, + JNIEnv *, // pEnv, jobject, // obj, jlong lThis) { @@ -2457,7 +2457,7 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getDbVersion( Desc: ****************************************************************************/ JNIEXPORT jint JNICALL Java_xflaim_Db__1getBlockSize( - JNIEnv * pEnv, + JNIEnv *, // pEnv, jobject, // obj, jlong lThis) { @@ -2470,7 +2470,7 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getBlockSize( Desc: ****************************************************************************/ JNIEXPORT jint JNICALL Java_xflaim_Db__1getDefaultLanguage( - JNIEnv * pEnv, + JNIEnv *, // pEnv, jobject, // obj, jlong lThis) { @@ -2483,7 +2483,7 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getDefaultLanguage( Desc: ****************************************************************************/ JNIEXPORT jlong JNICALL Java_xflaim_Db__1getTransID( - JNIEnv * pEnv, + JNIEnv *, // pEnv, jobject, // obj, jlong lThis) { @@ -2684,7 +2684,7 @@ Exit: Desc: ****************************************************************************/ JNIEXPORT jint JNICALL Java_xflaim_Db__1getMustCloseRC( - JNIEnv * pEnv, + JNIEnv *, // pEnv, jobject, // obj, jlong lThis) { @@ -2696,7 +2696,7 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getMustCloseRC( Desc: ****************************************************************************/ JNIEXPORT jint JNICALL Java_xflaim_Db__1getAbortRC( - JNIEnv * pEnv, + JNIEnv *, // pEnv, jobject, // obj, jlong lThis) { @@ -2708,7 +2708,7 @@ JNIEXPORT jint JNICALL Java_xflaim_Db__1getAbortRC( Desc: ****************************************************************************/ JNIEXPORT void JNICALL Java_xflaim_Db__1setMustAbortTrans( - JNIEnv * pEnv, + JNIEnv *, // pEnv, jobject, // obj, jlong lThis, jint iRc) diff --git a/xflaim/java/jni/jdbsystem.cpp b/xflaim/java/jni/jdbsystem.cpp index e78be16..1de8199 100644 --- a/xflaim/java/jni/jdbsystem.cpp +++ b/xflaim/java/jni/jdbsystem.cpp @@ -1754,7 +1754,7 @@ Desc: JNIEXPORT jlong JNICALL Java_xflaim_DbSystem__1openBufferIStream( JNIEnv * pEnv, jobject, // obj, - jlong lThis, + jlong, // lThis, jstring sBuffer) { RCODE rc = NE_XFLM_OK; diff --git a/xflaim/util/view.cpp b/xflaim/util/view.cpp index a0df302..a039c8e 100644 --- a/xflaim/util/view.cpp +++ b/xflaim/util/view.cpp @@ -569,7 +569,8 @@ Get_File_Name: goto Exit; } - if (RC_BAD( rc = pSFileClient->setup( gv_szViewFileName, gv_szDataDir))) + if (RC_BAD( rc = pSFileClient->setup( gv_szViewFileName, gv_szDataDir, + gv_ViewDbHdr.ui32MaxFileSize))) { ViewShowRCError( "setting up super file handle", rc); goto Exit; @@ -593,7 +594,6 @@ Get_File_Name: rc = ViewReadAndVerifyHdrInfo( NULL); gv_pSFileHdl->releaseFiles(); - gv_pSFileHdl->setBlockSize( (FLMUINT)gv_ViewDbHdr.ui16BlockSize); if (RC_BAD( rc)) {