Changeset 483 for trunk/thune/files.c

Timestamp:

10/05/07 04:54:10 (14 months ago)

Author:

krobillard

Message:

select! evaluation now pushes all values other than function! & call!.
Added ur_decompress().
Now using GLV from the Outguard repository.
gl/project.r now builds thuneGL library.

Files:

• trunk/thune/files.c (modified) (2 diffs)

trunk/thune/files.c

@@ -696 +696 @@
 
 
+/**
+   Decompress data into intialized array.
+
+   \return  Non-zero if successful.
+*/
+int ur_decompress( const void* data, int len, UArray* arr )
+{
+#define BUF_LOW     32
+    bz_stream strm;
+    int ok;
+
+    strm.bzalloc = 0;
+    strm.bzfree  = 0;
+    strm.opaque  = 0;
+
+    ok = BZ2_bzDecompressInit( &strm, 0, 0 );
+    if( ok != BZ_OK )
+    {
+        //fprintf( stderr, "BZ2_bzDecompressInit failure (%d)", ok );
+        return 0;
+    }
+
+    strm.next_in  = (char*) data;
+    strm.avail_in = len;
+
+    ur_arrayReserve( arr, 1, (len < BUF_LOW) ? BUF_LOW : len );
+    strm.next_out  = arr->ptr.c;
+    strm.avail_out = arr->avail;
+
+    do
+    {
+        if( strm.avail_out < BUF_LOW )
+        {
+            ur_arrayReserve( arr, 1, arr->avail + (2 * BUF_LOW) );
+            strm.next_out  = arr->ptr.c + strm.total_out_lo32;
+            strm.avail_out = arr->avail - strm.total_out_lo32;
+        }
+
+        ok = BZ2_bzDecompress( &strm );
+        arr->used = strm.total_out_lo32;
+    }
+    while( ok == BZ_OK );
+
+    BZ2_bzDecompressEnd( &strm );
+
+    return (ok == BZ_STREAM_END) ? 1 : 0;
+}
+
+
 // (binary -- string)
 UR_CALL( uc_decompress )
 {
-#define BUF_LOW     32
-    int ok;
-    int len;
-    bz_stream strm;
     UIndex strN;
     UString* str;
@@ -708 +753 @@
     char* cpB;
 
-
     if( ! ur_binarySlice( ut, tos, &cpA, &cpB ) || (cpA == 0) )
         return;
 
-    strm.bzalloc = 0;
-    strm.bzfree  = 0;
-    strm.opaque  = 0;
-
-    ok = BZ2_bzDecompressInit( &strm, 0, 0 );
-    if( ok == BZ_OK )
-    {
-        len = cpB - cpA;
-        strm.next_in   = cpA;
-        strm.avail_in  = len;
-
-        strN = ur_makeBinary( (len < BUF_LOW) ? BUF_LOW : len, &str );
-        strm.next_out  = str->ptr.c;
-        strm.avail_out = str->avail;
-
-        while( ok == BZ_OK )
-        {
-            if( strm.avail_out < BUF_LOW )
-            {
-                ur_arrayReserve( str, 1, str->avail + (2 * BUF_LOW) );
-                strm.next_out  = str->ptr.c + strm.total_out_lo32;
-                strm.avail_out = str->avail - strm.total_out_lo32;
-            }
-
-            ok = BZ2_bzDecompress( &strm );
-            str->used = strm.total_out_lo32;
-        }
-
-        BZ2_bzDecompressEnd( &strm );
-
-        if( ok == BZ_STREAM_END )
-        {
-            ur_initType( tos, UT_STRING );
-            ur_setSeries( tos, strN, 0 );
-            return;
-        }
-        ur_throwErr( UR_ERR_INTERNAL, "decompress failure (%d)", ok );
-    }
-    ur_throwErr( UR_ERR_INTERNAL, "decompress init failure (%d)", ok );
+    strN = ur_makeBinary( 0, &str );
+
+    if( ur_decompress( cpA, cpB - cpA, str ) )
+    {
+        ur_initString( tos, strN, 0 );
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_INTERNAL, "decompress failure" );
+    }
 }
 #endif