commit 5633c308b740e84383a31b52b018780408bd2aad
author Jeff Thompson <jefft0@gmail.com> Thu Jul 11 10:24:27 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Thu Jul 11 10:24:27 2013 -0700
tree eba0ba9c885854f1464724c6a79b6b331873497f
parent 4069ce9ba878117185481671c0691298c7dbcbcb

Added ndn_decodeOptionalBinaryXMLPublisherPublicKeyDigest

ndn-cpp/c/encoding/BinaryXMLInterest.c

diff --git a/ndn-cpp/c/encoding/BinaryXMLInterest.c b/ndn-cpp/c/encoding/BinaryXMLInterest.c
index c7e4177..a6e4ea8 100644
--- a/ndn-cpp/c/encoding/BinaryXMLInterest.c
+++ b/ndn-cpp/c/encoding/BinaryXMLInterest.c
@@ -203,18 +203,10 @@
       (decoder, ndn_BinaryXML_DTag_MaxSuffixComponents, &interest->maxSuffixComponents))
     return error;
   
-  int gotExpectedTag;
-  if (error = ndn_BinaryXMLDecoder_peekDTag(decoder, ndn_BinaryXML_DTag_PublisherPublicKeyDigest, &gotExpectedTag))
+  if (error = ndn_decodeOptionalBinaryXMLPublisherPublicKeyDigest(&interest->publisherPublicKeyDigest, decoder))
     return error;
-  if (gotExpectedTag) {
-    if (error = ndn_decodeBinaryXMLPublisherPublicKeyDigest(&interest->publisherPublicKeyDigest, decoder))
-      return error;
-  }
-  else {
-    interest->publisherPublicKeyDigest.publisherPublicKeyDigest = 0;
-    interest->publisherPublicKeyDigest.publisherPublicKeyDigestLength = 0;
-  }
   
+  int gotExpectedTag;
   if (error = ndn_BinaryXMLDecoder_peekDTag(decoder, ndn_BinaryXML_DTag_Exclude, &gotExpectedTag))
     return error;
   if (gotExpectedTag) {