Changeset b67be8d in tol

Timestamp:

Sep 7, 2009, 7:47:05 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

d626b32

Parents:

d794d03

Message:

New class BFileDesc to ahndle with TOL file input-output functions

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1340 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/btol/bdb

Files:

• filehandle.cpp (modified) (13 diffs)
• tol_filehandle.h (added)

tol/btol/bdb/filehandle.cpp

@@ -25 +25 @@
 
 
+#include <tol/tol_filehandle.h>
 #include <tol/tol_bout.h>
 #include <tol/tol_btxtgra.h>
@@ -39 +40 @@
 BTraceInit("file.cpp");
 
-/////////////////////////////////////////////////////////////////////////////
-struct BFileDesc
-/////////////////////////////////////////////////////////////////////////////
-{
-  FILE* file_;
-  BText path_;
-  BFileDesc(FILE* file, BText path)
-  : file_(file),
-    path_(path)
-  { }
-};
-
-BFileDesc noFileDesc_(NULL,"");
-
-typedef hash_map_by_int <BFileDesc*>::dense_ BFileHashByHandle;
-
-
-/////////////////////////////////////////////////////////////////////////////
-static BFileHashByHandle& FileHandle()
+
+BFileDesc BFileDesc::noFileDesc_(NULL,"");
+
+
+/////////////////////////////////////////////////////////////////////////////
+BFileDesc::BFileHashByHandle& BFileDesc::FileHandle()
 /////////////////////////////////////////////////////////////////////////////
 {
@@ -73 +61 @@
 
 /////////////////////////////////////////////////////////////////////////////
-static FILE* CheckFileHandle(int handle, bool verbose, const BText& msg, 
-                             BFileHashByHandle::const_iterator& found)
+ FILE* BFileDesc::CheckFileHandle(int handle, bool verbose, const BText& msg, 
+                                  BFileHashByHandle::const_iterator& found)
 /////////////////////////////////////////////////////////////////////////////
 {
@@ -96 +84 @@
 
 /////////////////////////////////////////////////////////////////////////////
-static FILE* CheckFileHandle(int handle, bool verbose, const BText& msg)
+FILE* BFileDesc::CheckFileHandle(int handle, bool verbose, const BText& msg)
 /////////////////////////////////////////////////////////////////////////////
 {
@@ -104 +92 @@
 
 /////////////////////////////////////////////////////////////////////////////
-void SysChkErrNo(bool clean, bool verbose, const BText& msg)
+void BFileDesc::SysChkErrNo(bool clean, bool verbose, const BText& msg)
 /////////////////////////////////////////////////////////////////////////////
 {
@@ -145 +133 @@
   if(Arg(2)) { verbose = int(Real(Arg(2)))!=0; }
   contens_ = errno;
-  SysChkErrNo(clean, verbose, "");
+  BFileDesc::SysChkErrNo(clean, verbose, "");
 }
 
@@ -215 +203 @@
   {
     handle = fileno(file);
-    FileHandle()[handle] = new BFileDesc(file, path);
+    BFileDesc::FileHandle()[handle] = new BFileDesc(file, path);
   }
   else
   {
-    SysChkErrNo(clean, verbose, 
+    BFileDesc::SysChkErrNo(clean, verbose, 
       I2("Fail in ","Fallo en ")+
       "FOpen(\""+path+"\",\""+access+"\")");
@@ -245 +233 @@
   contens_ = "";
    
-  FILE* file = CheckFileHandle(handle,true,
+  FILE* file = BFileDesc::CheckFileHandle(handle,true,
                                I2("Fail in ","Fallo en ")+"FGetText");
   if(file)
@@ -266 +254 @@
   BText& txt    = Text(Arg(2));
   contens_ = EOF;
-  FILE* file = CheckFileHandle(handle,true,
+  FILE* file = BFileDesc::CheckFileHandle(handle,true,
                                I2("Fail in ","Fallo en ")+"FPutText");
   if(file)
@@ -288 +276 @@
   int handle  = (int)Real(Arg(1));
   contens_ = EOF;
-  FILE* file = CheckFileHandle(handle, true,
+  FILE* file = BFileDesc::CheckFileHandle(handle, true,
                                I2("Fail in ","Fallo en ")+"FEof");
   if(file)
@@ -320 +308 @@
   else
   {
-    FILE* file = CheckFileHandle(handle, true,
+    FILE* file = BFileDesc::CheckFileHandle(handle, true,
                                  I2("Fail in ","Fallo en ")+"FFlush");
     if(file)
@@ -350 +338 @@
   if(Arg(3)) { verbose = int(Real(Arg(3)))!=0; }
   contens_ = EOF;
-  BFileHashByHandle::const_iterator found;
+  BFileDesc::BFileHashByHandle::const_iterator found;
   BText failMsg = I2("Fail in ","Fallo en ")+"FClose";
-  FILE* file = CheckFileHandle(handle, true, failMsg, found);
+  FILE* file = BFileDesc::CheckFileHandle(handle, true, failMsg, found);
   if(file)
   {
@@ -359 +347 @@
     if(!fc)
     {
-      FileHandle().erase(found->first);
+      BFileDesc::FileHandle().erase(found->first);
     }
     else
     {
-      SysChkErrNo(clean, verbose, failMsg);
+      BFileDesc::SysChkErrNo(clean, verbose, failMsg);
     }
   }