Tag: cws_src680_warnings01 User: pl Date: 05/11/07 11:10:40 Modified: /dba/connectivity/source/drivers/hsqldb/ StorageNativeInputStream.cxx
Log: RESYNC: (1.6-1.7); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: StorageNativeInputStream.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx?r1=1.6.10.1&r2=1.6.10.2 Delta lines: +15 -15 --------------------- --- StorageNativeInputStream.cxx 7 Nov 2005 14:43:38 -0000 1.6.10.1 +++ StorageNativeInputStream.cxx 7 Nov 2005 19:10:37 -0000 1.6.10.2 @@ -98,7 +98,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream (JNIEnv * env, jobject obj_this,jstring key, jstring name, jint mode) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG { OperationLogFile( env, name, "input" ).logOperation( "openStream" ); LogFile( env, name, "input" ).create(); @@ -116,7 +116,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv * env, jobject obj_this,jstring key, jstring name) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG OperationLogFile( env, name, "input" ).logOperation( "read()" ); DataLogFile aDataLog( env, name, "input" ); @@ -135,7 +135,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray buffer, jint off, jint len) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG OperationLogFile( env, name, "input" ).logOperation( "read( byte[], int, int )" ); DataLogFile aDataLog( env, name, "input" ); @@ -154,7 +154,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close (JNIEnv * env, jobject obj_this,jstring key, jstring name) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG OperationLogFile aOpLog( env, name, "input" ); aOpLog.logOperation( "close" ); aOpLog.close(); @@ -174,7 +174,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip (JNIEnv * env, jobject obj_this,jstring key, jstring name, jlong n) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG OperationLogFile( env, name, "input" ).logOperation( "skip()" ); #endif @@ -209,7 +209,7 @@ } while (tmpLongVal > 0); } - catch(Exception& e ) + catch(Exception& ) { } @@ -240,7 +240,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available (JNIEnv * env, jobject obj_this,jstring key, jstring name) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG OperationLogFile aOpLog( env, name, "input" ); aOpLog.logOperation( "available" ); #endif @@ -253,7 +253,7 @@ try { jint nAvailable = xIn->available(); -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG aOpLog.logReturn( nAvailable ); #endif return nAvailable; @@ -282,7 +282,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray buffer) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG OperationLogFile aOpLog( env, name, "input" ); aOpLog.logOperation( "read( byte[] )" ); @@ -313,7 +313,7 @@ // must <= len. // if (nBytesRead <= 0) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG aOpLog.logReturn( (jint)-1 ); #endif return -1; @@ -321,11 +321,11 @@ OSL_ENSURE(nLen >= nBytesRead,"Buffer is too small!"); OSL_ENSURE(aData.getLength() >= nBytesRead,"Buffer is too small!"); env->SetByteArrayRegion(buffer,0,nBytesRead,&aData[0]); -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG aDataLog.write( &aData[0], nBytesRead ); #endif } -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG aOpLog.logReturn( nBytesRead ); #endif return nBytesRead; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
