diff --git a/include/extcdecl.h b/include/extcdecl.h index 54fb0d500..0c59bd652 100755 --- a/include/extcdecl.h +++ b/include/extcdecl.h @@ -30,7 +30,6 @@ extern "C" { extern PathSt __ptprf; // Guy moved these outside extern - extern isfdptr* openf; extern Str80 cprefix; /* @END */ diff --git a/include/isam.cpp b/include/isam.cpp index b1e85d379..d357e7643 100755 --- a/include/isam.cpp +++ b/include/isam.cpp @@ -1259,13 +1259,6 @@ TLocalisamfile::TLocalisamfile(int logicnum, bool tmpfile) TLocalisamfile::~TLocalisamfile() { close(); -// dalla 1.5 ??? -// if (_isamfile && openf[num()-1] != NULL) -// { -// if (_was_open) -// setkey(_oldkey); -// close(); -// } } int TLocalisamfile::close() @@ -2389,38 +2382,6 @@ void TBaseisamfile::recover() //////////////////////////////////////////////////////////// // TRectype //////////////////////////////////////////////////////////// -void TRectype::init(int logicnum) -{ - bool has_memo_fld = FALSE; - - _logicnum = logicnum; - - CHECK(_logicnum < LF_EXTERNAL,"Impossibile costruire un record di un file esterno"); - - if (openf[_logicnum - 1] != NULL) - { - _length = DB_reclen(openf[logicnum - 1]->fhnd); - has_memo_fld = rec_has_memo(rec_des()); - } - else - { - TDir wdir; - wdir.get(_logicnum, _nolock, _nordir, _sysdirop); - if (wdir.is_com()) - wdir.get(_logicnum, _nolock, _comdir, _sysdirop); - _length = wdir.len(); - has_memo_fld = _length > 0 && rec_has_memo(rec_des()); - } - _rec = new char [ _length ]; - *_tab = '\0'; - if (_length) - zero(); - else - setempty(TRUE); - if(has_memo_fld) - init_memo(RECORD_NON_FISICO ); -} - TRectype::TRectype(int logicnum) : _memo_data(NULL), _memo_dirty(NULL) diff --git a/include/varrec.cpp b/include/varrec.cpp index 2d521522f..0fa460a59 100755 --- a/include/varrec.cpp +++ b/include/varrec.cpp @@ -9,8 +9,6 @@ // return FALSE; //} -extern bool rec_has_memo( const RecDes * rd ); - TVariable_field::TVariable_field( const char * name, // const char * expr, // @@ -388,7 +386,7 @@ TExtrectype::TExtrectype(const TTrec& r) : TVariable_rectype(r.num()) _rec = new char [ _length ]; _rd = new RecDes; memcpy(_rd, r.rec(),sizeof(RecDes)); - if( rec_has_memo(_rd)) + if(has_memo()) init_memo(RECORD_NON_FISICO ); zero(); }