commit faaa2370841d93bed16b3f75357c9c8e29a0e392
author Jeff Thompson <jefft0@gmail.com> Mon Aug 12 13:16:35 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Mon Aug 12 13:16:35 2013 -0700
tree a68215c2dd5c3f2fb7ae1e25cf83837c2faca4eb
parent 529779ae86f564226951d4014beae485d092d5ad

In BinaryXmlEncoder, use DynamicUCharVector.

ndn-cpp/encoding/binary-xml-encoder.hpp

diff --git a/ndn-cpp/encoding/binary-xml-encoder.hpp b/ndn-cpp/encoding/binary-xml-encoder.hpp
index 6373466..fc5d451 100644
--- a/ndn-cpp/encoding/binary-xml-encoder.hpp
+++ b/ndn-cpp/encoding/binary-xml-encoder.hpp
@@ -8,7 +8,7 @@
 
 #include <vector>
 #include "../common.hpp"
-#include "../c/util/ndn_realloc.h"
+#include "../util/dynamic-uchar-vector.hpp"
 #include "../c/encoding/binary-xml-encoder.h"
 
 namespace ndn {
@@ -22,9 +22,8 @@
    * Initialize the base ndn_BinaryXmlEncoder struct with an initial array of 16 bytes.  Use simpleRealloc.
    */
   BinaryXmlEncoder() 
+  : output_(16)
   {
-    const unsigned int initialLength = 16;
-    ndn_BinaryXmlEncoder_init(this, (unsigned char *)malloc(initialLength), initialLength, ndn_realloc);
   }
   
   /**
@@ -32,8 +31,10 @@
    */
   ptr_lib::shared_ptr<std::vector<unsigned char> > getOutput() 
   {
-    return ptr_lib::shared_ptr<std::vector<unsigned char> >(new std::vector<unsigned char>(output.array, output.array + offset));
+    return output_.get();
   }
+  
+  DynamicUCharVector output_;
 };
 
 }

ndn-cpp/key-chain.cpp

diff --git a/ndn-cpp/key-chain.cpp b/ndn-cpp/key-chain.cpp
index c2a10ff..1da6f9d 100644
--- a/ndn-cpp/key-chain.cpp
+++ b/ndn-cpp/key-chain.cpp
@@ -106,7 +106,7 @@
   if ((error = ndn_encodeBinaryXmlData(&dataStruct, &signedFieldsBeginOffset, &signedFieldsEndOffset, &encoder)))
     throw std::runtime_error(ndn_getErrorString(error));
   
-  digestSha256(encoder.output.array + signedFieldsBeginOffset, signedFieldsEndOffset - signedFieldsBeginOffset, digest);
+  digestSha256(&encoder.getOutput()->front() + signedFieldsBeginOffset, signedFieldsEndOffset - signedFieldsBeginOffset, digest);
 }
 
 void KeyChain::sign