diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h index ea6b33a..3501318 100644 --- a/ftk/src/ftk.h +++ b/ftk/src/ftk.h @@ -1384,7 +1384,7 @@ virtual FLMINT32 FLMAPI getInt32( FLMINT32 i32Low = FLM_MIN_INT32, - FLMINT32 i32High = FLM_MAX_INT32); + FLMINT32 i32High = FLM_MAX_INT32) = 0; virtual FLMBOOL FLMAPI getBoolean( void) = 0; }; diff --git a/ftk/src/ftkfsys.cpp b/ftk/src/ftkfsys.cpp index 92cf3d8..b4aa9c9 100644 --- a/ftk/src/ftkfsys.cpp +++ b/ftk/src/ftkfsys.cpp @@ -393,6 +393,20 @@ RCODE FLMAPI FlmGetFileSystem( return( NE_FLM_OK); } +/**************************************************************************** +Desc: +****************************************************************************/ +RCODE f_allocFileHdl( + F_FileHdl ** ppFileHdl) +{ + if( (*ppFileHdl = f_new F_FileHdl) == NULL) + { + return( RC_SET( NE_FLM_MEM)); + } + + return( NE_FLM_OK); +} + /**************************************************************************** Desc: Create a file, return a file handle to created file. ****************************************************************************/ diff --git a/ftk/src/ftksys.h b/ftk/src/ftksys.h index 73476de..3bfb2de 100644 --- a/ftk/src/ftksys.h +++ b/ftk/src/ftksys.h @@ -1870,6 +1870,11 @@ RCODE FLMAPI unlock( void); + FINLINE FLMBOOL FLMAPI isReadOnly( void) + { + return( m_bOpenedReadOnly); + } + FINLINE void FLMAPI setBlockSize( FLMUINT uiBlockSize) { diff --git a/ftk/src/ftkunix.cpp b/ftk/src/ftkunix.cpp index 1206477..d022dac 100644 --- a/ftk/src/ftkunix.cpp +++ b/ftk/src/ftkunix.cpp @@ -41,6 +41,7 @@ #include +extern FLMUINT gv_uiMaxFileSize; extern FLMBOOL gv_bOkToDoAsyncWrites; #if defined( FLM_SOLARIS) @@ -1607,6 +1608,13 @@ static void sparc_asm_code( void) } #endif +/**************************************************************************** +Desc: +****************************************************************************/ +void FLMAPI f_yieldCPU( void) +{ +} + #endif // FLM_UNIX #if defined( FLM_WATCOM_NLM) diff --git a/ftk/src/ftkwin.cpp b/ftk/src/ftkwin.cpp index 26f2939..b005a34 100644 --- a/ftk/src/ftkwin.cpp +++ b/ftk/src/ftkwin.cpp @@ -27,20 +27,6 @@ #if defined( FLM_WIN) -/**************************************************************************** -Desc: -****************************************************************************/ -RCODE f_allocFileHdl( - F_FileHdl ** ppFileHdl) -{ - if( (*ppFileHdl = f_new F_FileHdl) == NULL) - { - return( RC_SET( NE_FLM_MEM)); - } - - return( NE_FLM_OK); -} - /**************************************************************************** Desc: ****************************************************************************/ diff --git a/ftk/src/ftkxml.cpp b/ftk/src/ftkxml.cpp index 240741d..a209569 100644 --- a/ftk/src/ftkxml.cpp +++ b/ftk/src/ftkxml.cpp @@ -43,68 +43,6 @@ typedef struct FLMUINT uiValue; } CharEntity; -static FLMUNICODE gv_puzXMLPrefix[] = -{ - FLM_UNICODE_x, - FLM_UNICODE_m, - FLM_UNICODE_l, - 0 -}; - -FLMUNICODE gv_puzXMLNSURI[] = -{ - FLM_UNICODE_h, - FLM_UNICODE_t, - FLM_UNICODE_t, - FLM_UNICODE_p, - FLM_UNICODE_COLON, - FLM_UNICODE_FSLASH, - FLM_UNICODE_FSLASH, - FLM_UNICODE_w, - FLM_UNICODE_w, - FLM_UNICODE_w, - FLM_UNICODE_PERIOD, - FLM_UNICODE_w, - FLM_UNICODE_3, - FLM_UNICODE_c, - FLM_UNICODE_PERIOD, - FLM_UNICODE_o, - FLM_UNICODE_r, - FLM_UNICODE_g, - FLM_UNICODE_FSLASH, - FLM_UNICODE_T, - FLM_UNICODE_R, - FLM_UNICODE_FSLASH, - FLM_UNICODE_1, - FLM_UNICODE_9, - FLM_UNICODE_9, - FLM_UNICODE_9, - FLM_UNICODE_FSLASH, - FLM_UNICODE_R, - FLM_UNICODE_E, - FLM_UNICODE_C, - FLM_UNICODE_HYPHEN, - FLM_UNICODE_x, - FLM_UNICODE_m, - FLM_UNICODE_l, - FLM_UNICODE_HYPHEN, - FLM_UNICODE_n, - FLM_UNICODE_a, - FLM_UNICODE_m, - FLM_UNICODE_e, - FLM_UNICODE_s, - FLM_UNICODE_HYPHEN, - FLM_UNICODE_1, - FLM_UNICODE_9, - FLM_UNICODE_9, - FLM_UNICODE_9, - FLM_UNICODE_0, - FLM_UNICODE_1, - FLM_UNICODE_1, - FLM_UNICODE_4, - 0 -}; - typedef struct { FLMUNICODE uLowChar;