commit 033d7fd3c0da9707c6b56dc975590f3d237b06c4
author Jeff Thompson <jefft0@gmail.com> Thu Jul 11 10:44:03 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Thu Jul 11 10:44:03 2013 -0700
tree 5fda54e3cda3339c8f6873d55a944127ceec3e97
parent 5633c308b740e84383a31b52b018780408bd2aad

Added readOptionalBinaryDTagElement

ndn-cpp/c/encoding/BinaryXMLInterest.c

diff --git a/ndn-cpp/c/encoding/BinaryXMLInterest.c b/ndn-cpp/c/encoding/BinaryXMLInterest.c
index a6e4ea8..6b02176 100644
--- a/ndn-cpp/c/encoding/BinaryXMLInterest.c
+++ b/ndn-cpp/c/encoding/BinaryXMLInterest.c
@@ -241,17 +241,9 @@
   else
     interest->interestLifetime = -1;
   
-  if (error = ndn_BinaryXMLDecoder_peekDTag(decoder, ndn_BinaryXML_DTag_Nonce, &gotExpectedTag))
+  if (error = ndn_BinaryXMLDecoder_readOptionalBinaryDTagElement
+      (decoder, ndn_BinaryXML_DTag_Nonce, 0, &interest->nonce, &interest->nonceLength))
     return error;
-  if (gotExpectedTag) {
-    if (error = ndn_BinaryXMLDecoder_readBinaryDTagElement
-        (decoder, ndn_BinaryXML_DTag_Nonce, 0, &interest->nonce, &interest->nonceLength))
-      return error;
-  }
-  else {
-    interest->nonce = 0;
-    interest->nonceLength = 0;
-  }
 
   if (error = ndn_BinaryXMLDecoder_readElementClose(decoder))
     return error;