Update upstream source from tag 'upstream/4.1.4'

Update to upstream version '4.1.4'
with Debian dir 403f575aa88344456029245280a05149f0173f2e

1 files changed, 9 insertions, 4 deletions

diff --git a/src/include/xbxbase.h b/src/include/xbxbase.h
index fe1f323..702da23 100755
--- a/src/include/xbxbase.h
+++ b/src/include/xbxbase.h
@@ -126,12 +126,13 @@ class XBDLLEXPORT xbXBase : public xbTblMgr{
   ~xbXBase();
 
   xbInt16  CloseAllTables();
+  xbInt16  CreateFqn( const xbString &sDirIn, const xbString &sNameIn, const xbString &sExtIn, xbString &sFqfnOut );
   void     DisableMsgLogging();
   void     EnableMsgLogging ();
   xbInt16  FlushLog();
 
-  const    xbString &GetLogDirectory () const;
-  const    xbString &GetLogFileName  () const;
+  //const    xbString &GetLogDirectory () const;
+  //const    xbString &GetLogFileName  () const;
   const    xbString &GetLogFqFileName() const;
   xbBool   GetLogStatus   () const;
 
@@ -140,9 +141,13 @@ class XBDLLEXPORT xbXBase : public xbTblMgr{
 
   xbDbf *  Open( const xbString &sTableName, xbInt16 &iRc );
   xbDbf *  Open( const xbString &sTableName, const xbString &sAlias, xbInt16 iOpenMode, xbInt16 iShareMode, xbInt16 iVersion, xbInt16 &iRc );
-  void     SetLogDirectory( const xbString &sLogFileDirectory );
-  void     SetLogFileName ( const xbString &sLogFileName );
+
+  // next three methods moved to xbssv for consistency
+  // void     SetLogDirectory( const xbString &sLogFileDirectory );
+  // void     SetLogFileName ( const xbString &sLogFileName );
   void     SetLogSize     ( size_t lSize );
+  size_t   GetLogSize     () const;
+
   xbInt16  WriteLogMessage( const xbString &sLogMessage, xbInt16 iOutputOpt = 0 );
   xbInt16  WriteLogBytes  ( xbUInt32 lCnt, const char *p );