binary-xml-wire-format: Partial enabling of binary-xml-wire-format
Due to significant changes, Data abstraction conversion (from and to
wire format) is currently disabled, using empty placeholders instead.
Other data structures should have working conversion (minus
PublisherPublicKeyDigest, which is not part of Interest and
ForwardingEntry data structure anymore).
Change-Id: I51c47495808c35b500fc6b1fcc0c46db217e6598
diff --git a/src/c/encoding/binary-xml-decoder.c b/src/c/encoding/binary-xml-decoder.c
index d3b4d22..110ce51 100644
--- a/src/c/encoding/binary-xml-decoder.c
+++ b/src/c/encoding/binary-xml-decoder.c
@@ -293,7 +293,7 @@
}
ndn_Error ndn_BinaryXmlDecoder_readTimeMillisecondsDTagElement
- (struct ndn_BinaryXmlDecoder *self, unsigned int expectedTag, double *milliseconds)
+ (struct ndn_BinaryXmlDecoder *self, unsigned int expectedTag, ndn_MillisecondsSince1970 *milliseconds)
{
ndn_Error error;
struct ndn_Blob bytes;
@@ -305,7 +305,7 @@
}
ndn_Error ndn_BinaryXmlDecoder_readOptionalTimeMillisecondsDTagElement
- (struct ndn_BinaryXmlDecoder *self, unsigned int expectedTag, double *milliseconds)
+ (struct ndn_BinaryXmlDecoder *self, unsigned int expectedTag, ndn_MillisecondsSince1970 *milliseconds)
{
int gotExpectedTag;
ndn_Error error;
diff --git a/src/c/encoding/binary-xml-decoder.h b/src/c/encoding/binary-xml-decoder.h
index 5072b97..3f427c1 100644
--- a/src/c/encoding/binary-xml-decoder.h
+++ b/src/c/encoding/binary-xml-decoder.h
@@ -156,7 +156,7 @@
* @return 0 for success, else an error code, including an error if not the expected tag
*/
ndn_Error ndn_BinaryXmlDecoder_readTimeMillisecondsDTagElement
- (struct ndn_BinaryXmlDecoder *self, unsigned int expectedTag, double *milliseconds);
+ (struct ndn_BinaryXmlDecoder *self, unsigned int expectedTag, ndn_MillisecondsSince1970 *milliseconds);
/**
* Peek at the next element, and if it has the expectedTag then call ndn_BinaryXmlDecoder_readTimeMillisecondsDTagElement.
@@ -167,7 +167,7 @@
* @return 0 for success, else an error code
*/
ndn_Error ndn_BinaryXmlDecoder_readOptionalTimeMillisecondsDTagElement
- (struct ndn_BinaryXmlDecoder *self, unsigned int expectedTag, double *milliseconds);
+ (struct ndn_BinaryXmlDecoder *self, unsigned int expectedTag, ndn_MillisecondsSince1970 *milliseconds);
/**
* Interpret the bytes as an unsigned big endian integer and convert to a double. Don't check for overflow.