Changeset 417 for branches/thune/thread_safe/files.c

Timestamp:

06/22/07 20:53:35 (17 months ago)

Author:

krobillard

Message:

Added ur_seriesMem() & fold helper.

Files:

• branches/thune/thread_safe/files.c (modified) (3 diffs)

branches/thune/thread_safe/files.c

@@ -622 +622 @@
     unsigned int blen;
 
-    if( ur_stringSlice( ut, tos, &cpA, &cpB ) && cpA )
-    {
-        len = cpB - cpA;
-        blen = len + (len / 99) + 600;
-
-        binN = ur_makeBinary( blen /*+ 4*/ );
-        bin = ur_binPtr( binN );
-
-        if( len > 0 )
-        {
-            ret = BZ2_bzBuffToBuffCompress( bin->ptr.c /*+ 4*/, &blen,
-                                            cpA, len,
-                                            3, 0, 0 );
-            if( ret == BZ_OUTBUFF_FULL )
-            {
-                ur_arrayFree( bin );
-                ur_throwErr( UR_ERR_ACCESS, "compress buffer full" );
-                return;
-            }
-            bin->used = blen;
-        }
-
-        ur_initType( tos, UT_BINARY );
-        ur_setSeries( tos, binN, 0 );
+    if( ur_seriesMem( ut, tos, &cpA, &cpB ) )
+    {
+        if( cpA )
+        {
+            len = cpB - cpA;
+            blen = len + (len / 99) + 600;
+
+            binN = ur_makeBinary( blen /*+ 4*/ );
+            bin = ur_binPtr( binN );
+
+            if( len > 0 )
+            {
+                ret = BZ2_bzBuffToBuffCompress( bin->ptr.c /*+ 4*/, &blen,
+                                                cpA, len,
+                                                3, 0, 0 );
+                if( ret == BZ_OUTBUFF_FULL )
+                {
+                    ur_arrayFree( bin );
+                    ur_throwErr( UR_ERR_ACCESS, "compress buffer full" );
+                    return;
+                }
+                bin->used = blen;
+            }
+
+            ur_initType( tos, UT_BINARY );
+            ur_setSeries( tos, binN, 0 );
+        }
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE,
+                     "compress expected string!/binary!/vector!" );
     }
 }
@@ -762 +770 @@
     res = UR_TOS;
 
-    if( ur_binarySlice( ut, res, &cpA, &cpB ) )
+    if( ur_seriesMem( ut, res, &cpA, &cpB ) )
     {
         switch( ur_atom(tos) )
@@ -794 +802 @@
     else
     {
-        ur_throwErr( UR_ERR_DATATYPE, "checksum expected binary!" );
+        ur_throwErr( UR_ERR_DATATYPE, "checksum expected string!/binary!" );
         return;
     }