Changeset 2463 for trunk

Timestamp:

Sep 2, 2011, 6:06:55 PM (13 years ago)

Author:

gah

Message:

fixes for broken do_compress

Location:

trunk/src/core

Files:

• RpBuffer.cc (modified) (1 diff)
• RpDict.h (modified) (1 prop)
• RpOutcome.cc (modified) (1 diff)
• RpUnits.h (modified) (1 prop)

trunk/src/core/RpBuffer.cc

@@ -321 +321 @@
             int have;
             have = CHUNK - strm.avail_out;
-
             /* write to file and check for error */
-            if (bout.append(out, have)) {
+            if ((have > 0) && (bout.append(out, have) == 0)) {
                 (void)deflateEnd(&strm);
                 bout.clear();
                 // return Z_ERRNO;
-                status.addError("error writing compressed data to temp buffer");
+                status.addError("error writing compressed data to temp buffer numBytes=%d", have);
                 return false;
             }

trunk/src/core/RpOutcome.cc

@@ -83 +83 @@
         _remark.append(bufPtr);
     }
+    /* fprintf(stderr, "Outcome: %s\n", _remark.c_str()); */
     _status = 1;                /* Set to error */
     if (bufPtr != stackSpace) {