Changeset 145 for trunk/orca

Timestamp:

05/11/06 15:55:43 (3 years ago)

Author:

krobillard

Message:

orReadDir() now holds new block.

Location:

trunk/orca

Files:

• files.c (modified) (4 diffs)
• unix/os.c (modified) (2 diffs)
• win32/os.c (modified) (2 diffs)

trunk/orca/files.c

@@ -259 +259 @@
 OR_NATIVE( orReadNative )
 {
-    if( a1->type == OT_FILE )
+    if( orIs(a1, OT_FILE) )
     {
         int n;
@@ -275 +275 @@
         else if( n == 1 )
         {
-            // TODO: Hold a1 from GC (or copy fn).
             orReadDir( a1, fn );
         }
@@ -365 +364 @@
         }
     }
-    else if( a1->type == OT_PORT )
+    else if( orIs(a1, OT_PORT) )
     {
         OArray* arr = &orEnv->devices;
@@ -541 +540 @@
 
 
-OR_NATIVE( orDecompressNative )
+OR_NATIVE_PUB( orDecompressNative )
 {
 #define BUF_LOW     32

trunk/orca/unix/os.c

@@ -168 +168 @@
     if( dir )
     {
+        OIndex hold;
+        OIndex blkN;
         OBlock* blk = orMakeBlock( 0 );
+
+        blkN = orBlockN(blk);
+        hold = orHold( OT_BLOCK, blkN );
 
         while( (entry = readdir( dir )) )
@@ -180 +185 @@
         closedir( dir );
 
-        orResult( OT_BLOCK, blk - orBLOCKS );
-        return;
-    }
-
-    orResultFALSE;
+        orRelease( hold );
+        orResultBLOCK( blkN );
+    }
+    else
+    {
+        orResultFALSE;
+    }
 }
 

trunk/orca/win32/os.c

@@ -191 +191 @@
     if( handle != -1 )
     {
+        OIndex hold;
+        OIndex blkN;
         OBlock* blk = orMakeBlock( 0 );
 
+        blkN = orBlockN(blk);
+        hold = orHold( OT_BLOCK, blkN );
+
         do
         {
@@ -201 +206 @@
         _findclose( handle );
 
-        orResult( OT_BLOCK, blk - orBLOCKS );
-        return;
-    }
-
-    orResultFALSE;
+        orRelease( hold );
+        orResultBLOCK( blkN );
+    }
+    else
+    {
+        orResultFALSE;
+    }
 }