commit 93034539579bccd25ebb3aa78ab9d8776b9ac3cc
author Jeff Thompson <jefft0@gmail.com> Tue Oct 08 11:52:43 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Tue Oct 08 11:52:43 2013 -0700
tree a6352bd8121e0c332b2b269eedc0f5c42b4955b3
parent b510e3e2388a5ba0acd41bb4e552f157cc282282

Internal: Use C struct ndn_Blob where possible. Make ndn::Blob work with ndn_Blob.

ndn-cpp/interest.cpp

diff --git a/ndn-cpp/interest.cpp b/ndn-cpp/interest.cpp
index dff002c..e1a6af7 100644
--- a/ndn-cpp/interest.cpp
+++ b/ndn-cpp/interest.cpp
@@ -31,7 +31,7 @@
     ndn_ExcludeEntry *entry = &excludeStruct.entries[i];
     
     if (entry->type == ndn_Exclude_COMPONENT)
-      addComponent(entry->component.value, entry->component.valueLength);
+      addComponent(entry->component.value.value, entry->component.value.length);
     else if (entry->type == ndn_Exclude_ANY)
       addAny();
     else
@@ -73,7 +73,7 @@
   answerOriginKind_ = interestStruct.answerOriginKind;
   scope_ = interestStruct.scope;
   interestLifetimeMilliseconds_ = interestStruct.interestLifetimeMilliseconds;
-  nonce_ = Blob(interestStruct.nonce, interestStruct.nonceLength);
+  nonce_ = Blob(interestStruct.nonce);
 }
 
 void 
@@ -88,12 +88,7 @@
   interestStruct.answerOriginKind = answerOriginKind_;
   interestStruct.scope = scope_;
   interestStruct.interestLifetimeMilliseconds = interestLifetimeMilliseconds_;
-
-  interestStruct.nonceLength = nonce_.size();
-  if (nonce_.size() > 0)
-    interestStruct.nonce = (uint8_t *)nonce_.buf();
-  else
-    interestStruct.nonce = 0;
+  nonce_.get(interestStruct.nonce);
 }
   
 }