Changeset 684 for trunk

Timestamp:

Apr 27, 2007 4:58:10 PM (17 years ago)

Author:

mmc

Message:

Fixed the Rappture::encoding Tcl bindings to handle binary data
properly. Fixed the tests to reflect the changes.

Added an example of using a <string> object for binary data.

Location:

trunk

Files:

• examples/zoo/binary (added)
• examples/zoo/binary/tardir.tcl (added)
• examples/zoo/binary/tool.xml (added)
• src/tcl/src/RpEncodeTclInterface.cc (modified) (2 diffs)
• src/tcl/tests/encode.test (modified) (3 diffs)

trunk/src/tcl/src/RpEncodeTclInterface.cc

@@ -251 +251 @@
     err &= Rappture::encoding::encode(buf,flags);
 
-    result = Tcl_GetObjResult(interp);
-
-
     if (!err) {
-        Tcl_DString dstPtr;
-        Tcl_DStringInit(&dstPtr);
-        Tcl_ExternalToUtfDString(NULL,buf.bytes(),buf.size(),&dstPtr);
-        Tcl_AppendToObj(result,Tcl_DStringValue(&dstPtr),Tcl_DStringLength(&dstPtr));
-        Tcl_DStringFree(&dstPtr);
+        result = Tcl_NewByteArrayObj(
+            (const unsigned char*)buf.bytes(), buf.size());
+        Tcl_SetObjResult(interp, result);
     }
     else {
+        result = Tcl_GetObjResult(interp);
         Tcl_AppendStringsToObj( result, err.remark().c_str(),
                                 "\n", err.context().c_str(), NULL   );
     }
-
-
     return TCL_OK;
 }
@@ -375 +369 @@
     err &= Rappture::encoding::decode(buf,flags);
 
-    result = Tcl_GetObjResult(interp);
-
     if (!err) {
-        Tcl_DString dstPtr;
-        Tcl_DStringInit(&dstPtr);
-        Tcl_ExternalToUtfDString(NULL,buf.bytes(),buf.size(),&dstPtr);
-        Tcl_AppendToObj(result,Tcl_DStringValue(&dstPtr),Tcl_DStringLength(&dstPtr));
-        Tcl_DStringFree(&dstPtr);
+        result = Tcl_NewByteArrayObj(
+            (const unsigned char*)buf.bytes(), buf.size());
+        Tcl_SetObjResult(interp, result);
     }
     else {
+        result = Tcl_GetObjResult(interp);
         Tcl_AppendStringsToObj( result, err.remark().c_str(),
                                 "\n", err.context().c_str(), NULL   );
     }
-
     return TCL_OK;
 }

trunk/src/tcl/tests/encode.test

@@ -91 +91 @@
 test encode-2.2.3 {Rappture::encoding::encode, -as z w/ string} {
     list [catch {Rappture::encoding::encode -as z "hi"} msg] $msg
-} {0 {@@RP-ENC:z
-\xCB\xC8\x3F\x2A\x3F\xD8}}
+} [list 0 "@@RP-ENC:z\n\037\213\010\000\000\000\000\000\000\003\313\310\004\000\254\052\223\330\002\000\000\000"]
 
 test encode-2.2.4 {Rappture::encoding::encode, -as b64 w/ string} {
@@ -135 +134 @@
     set h "@@RP-ENC:zb64\nH4sIAAAAAAAAA8vIBACsKpPYAgAAAA=="
     list [catch {Rappture::encoding::decode -as z $h} msg] $msg
-} {0 hi}
+} {0 {@@RP-ENC:zb64
+H4sIAAAAAAAAA8vIBACsKpPYAgAAAA==}}
 
 test decode-3.2.3 {Rappture::encoding::decode, -as flag, b64 w/ string} {
@@ -142 +142 @@
 } {0 hi}
 
+test decode-3.2.4 {encode/decode reverse each other} {
+    set msg "This is a test"
+    Rappture::encoding::decode [Rappture::encoding::encode $msg]
+} {This is a test}
+
 
 ::tcltest::cleanupTests