Changeset 1385 for trunk/src

Timestamp:

Apr 6, 2009, 10:26:05 AM (16 years ago)

Author:

gah

Message:

 

File:

• trunk/src/core/RpEncode.cc (modified) (7 diffs)

trunk/src/core/RpEncode.cc

@@ -136 +136 @@
 
 bool
-Rappture::encoding::encode(Rappture::Outcome &err, Rappture::Buffer& buf, 
+Rappture::encoding::encode(Rappture::Outcome &status, Rappture::Buffer& buf, 
                            unsigned int flags)
 {
@@ -151 +151 @@
     }
     if (outData.append(buf.bytes(), buf.size()) != (int)size) {
-        err.addError("can't append %lu bytes", size);
-        return false;
-    }
-    if (!outData.encode(err, flags)) {
+        status.addError("can't append %lu bytes", size);
+        return false;
+    }
+    if (!outData.encode(status, flags)) {
         return false;
     }
@@ -174 +174 @@
     }
     if (buf.append(outData.bytes(),outData.size()) != (int)outData.size()) {
-        err.addError("can't append %d bytes", outData.size());
+        status.addError("can't append %d bytes", outData.size());
         return false;
     }
@@ -189 +189 @@
  *
  * Full function call:
- * Rappture::encoding::decode (buf,flags)
+ * Rappture::encoding::decode(context, buf,flags)
  *
  * The check header flag is confusing here.
@@ -195 +195 @@
 
 bool
-Rappture::encoding::decode(Rappture::Outcome &err, Rappture::Buffer& buf, 
-                unsigned int flags)
+Rappture::encoding::decode(Rappture::Outcome &status, Rappture::Buffer& buf, 
+                           unsigned int flags)
 {
     Rappture::Buffer outData;
@@ -204 +204 @@
     size_t size;
     size = buf.size();
-    if (size <= 0) {
+    if (size == 0) {
         return true;            // Nothing to decode.
     }
     bytes = buf.bytes();
     if ((flags & RPENC_RAW) == 0) {
-        if (strncmp(bytes, "@@RP-ENC:z\n", 11) == 0) {
+        if ((size > 11) && (strncmp(bytes, "@@RP-ENC:z\n", 11) == 0)) {
             bytes += 11;
             size -= 11;
             flags &= ~RPENC_B64;
             flags |= RPENC_Z;
-        } else if (strncmp(bytes, "@@RP-ENC:b64\n", 13) == 0) {
+        } else if ((size > 13) && (strncmp(bytes, "@@RP-ENC:b64\n", 13) == 0)){
             bytes += 13;
             size -= 13;
             flags &= ~RPENC_Z;
             flags |= RPENC_B64;
-        } else if (strncmp(bytes, "@@RP-ENC:zb64\n", 14) == 0) {
+        } else if ((size > 14) && (strncmp(bytes, "@@RP-ENC:zb64\n", 14) == 0)){
             bytes += 14;
             size -= 14;
@@ -229 +229 @@
     }
     if (outData.append(bytes, size) != (int)size) {
-        err.addError("can't append %d bytes to buffer", size);
-        return false;
-    }
-    if (!outData.decode(err, flags)) {
+        status.addError("can't append %d bytes to buffer", size);
+        return false;
+    }
+    if (!outData.decode(status, flags)) {
         return false;
     }