global: Rename unsigned char to uint8, DynamicUCharArray to DynamicUInt8Array and DynamicUCharVector to DynamicUInt8Vector.
diff --git a/ndn-cpp/encoding/binary-xml-decoder.hpp b/ndn-cpp/encoding/binary-xml-decoder.hpp
index 7b28e7f..1bbca34 100644
--- a/ndn-cpp/encoding/binary-xml-decoder.hpp
+++ b/ndn-cpp/encoding/binary-xml-decoder.hpp
@@ -22,9 +22,9 @@
/**
* Initialize the base ndn_BinaryXmlDecoder struct with the input.
*/
- BinaryXmlDecoder(const unsigned char *input, unsigned int inputLength)
+ BinaryXmlDecoder(const uint8_t *input, unsigned int inputLength)
{
- ndn_BinaryXmlDecoder_initialize(this, (unsigned char *)input, inputLength);
+ ndn_BinaryXmlDecoder_initialize(this, (uint8_t *)input, inputLength);
}
/**
diff --git a/ndn-cpp/encoding/binary-xml-element-reader.cpp b/ndn-cpp/encoding/binary-xml-element-reader.cpp
index 6a7c5ad..bfb9a2a 100644
--- a/ndn-cpp/encoding/binary-xml-element-reader.cpp
+++ b/ndn-cpp/encoding/binary-xml-element-reader.cpp
@@ -9,7 +9,7 @@
namespace ndn {
void
-ElementListener::staticOnReceivedElement(struct ndn_ElementListener *self, unsigned char *element, unsigned int elementLength)
+ElementListener::staticOnReceivedElement(struct ndn_ElementListener *self, uint8_t *element, unsigned int elementLength)
{
((ElementListener *)self)->onReceivedElement(element, elementLength);
}
diff --git a/ndn-cpp/encoding/binary-xml-element-reader.hpp b/ndn-cpp/encoding/binary-xml-element-reader.hpp
index c86b99a..5aed8a0 100644
--- a/ndn-cpp/encoding/binary-xml-element-reader.hpp
+++ b/ndn-cpp/encoding/binary-xml-element-reader.hpp
@@ -29,7 +29,7 @@
* @param elementLength length of element
*/
virtual void
- onReceivedElement(const unsigned char *element, unsigned int elementLength) = 0;
+ onReceivedElement(const uint8_t *element, unsigned int elementLength) = 0;
private:
/**
@@ -39,7 +39,7 @@
* @param elementLength
*/
static void
- staticOnReceivedElement(struct ndn_ElementListener *self, unsigned char *element, unsigned int elementLength);
+ staticOnReceivedElement(struct ndn_ElementListener *self, uint8_t *element, unsigned int elementLength);
};
}
diff --git a/ndn-cpp/encoding/binary-xml-encoder.hpp b/ndn-cpp/encoding/binary-xml-encoder.hpp
index 7c7f626..af495ca 100644
--- a/ndn-cpp/encoding/binary-xml-encoder.hpp
+++ b/ndn-cpp/encoding/binary-xml-encoder.hpp
@@ -9,7 +9,7 @@
#include <vector>
#include "../common.hpp"
-#include "../util/dynamic-uchar-vector.hpp"
+#include "../util/dynamic-uint8-vector.hpp"
#include "../c/encoding/binary-xml-encoder.h"
namespace ndn {
@@ -32,14 +32,14 @@
* Resize the output vector to the correct encoding length and return.
* @return The encoding as a shared_ptr. Assume that the caller now owns the vector.
*/
- const ptr_lib::shared_ptr<std::vector<unsigned char> >&
+ const ptr_lib::shared_ptr<std::vector<uint8_t> >&
getOutput()
{
output_.get()->resize(offset);
return output_.get();
}
- DynamicUCharVector output_;
+ DynamicUInt8Vector output_;
};
}
diff --git a/ndn-cpp/encoding/binary-xml-structure-decoder.hpp b/ndn-cpp/encoding/binary-xml-structure-decoder.hpp
index a1911ea..0fbc1cf 100644
--- a/ndn-cpp/encoding/binary-xml-structure-decoder.hpp
+++ b/ndn-cpp/encoding/binary-xml-structure-decoder.hpp
@@ -31,7 +31,7 @@
* @return true if found the element end, false if need to read more. (This is the same as returning gotElementEnd().)
*/
bool
- findElementEnd(unsigned char *input, unsigned int inputLength)
+ findElementEnd(uint8_t *input, unsigned int inputLength)
{
ndn_Error error;
if ((error = ndn_BinaryXmlStructureDecoder_findElementEnd(this, input, inputLength)))
diff --git a/ndn-cpp/encoding/binary-xml-wire-format.cpp b/ndn-cpp/encoding/binary-xml-wire-format.cpp
index 71f74d5..130412c 100644
--- a/ndn-cpp/encoding/binary-xml-wire-format.cpp
+++ b/ndn-cpp/encoding/binary-xml-wire-format.cpp
@@ -46,7 +46,7 @@
}
void
-BinaryXmlWireFormat::decodeInterest(Interest& interest, const unsigned char *input, unsigned int inputLength)
+BinaryXmlWireFormat::decodeInterest(Interest& interest, const uint8_t *input, unsigned int inputLength)
{
struct ndn_NameComponent nameComponents[100];
struct ndn_ExcludeEntry excludeEntries[100];
@@ -84,7 +84,7 @@
void
BinaryXmlWireFormat::decodeData
- (Data& data, const unsigned char *input, unsigned int inputLength, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset)
+ (Data& data, const uint8_t *input, unsigned int inputLength, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset)
{
struct ndn_NameComponent nameComponents[100];
struct ndn_NameComponent keyNameComponents[100];
@@ -119,7 +119,7 @@
}
void
-BinaryXmlWireFormat::decodeForwardingEntry(ForwardingEntry& forwardingEntry, const unsigned char *input, unsigned int inputLength)
+BinaryXmlWireFormat::decodeForwardingEntry(ForwardingEntry& forwardingEntry, const uint8_t *input, unsigned int inputLength)
{
struct ndn_NameComponent prefixNameComponents[100];
struct ndn_ForwardingEntry forwardingEntryStruct;
diff --git a/ndn-cpp/encoding/binary-xml-wire-format.hpp b/ndn-cpp/encoding/binary-xml-wire-format.hpp
index 350561e..de1388e 100644
--- a/ndn-cpp/encoding/binary-xml-wire-format.hpp
+++ b/ndn-cpp/encoding/binary-xml-wire-format.hpp
@@ -32,7 +32,7 @@
* @param inputLength The number of bytes in input.
*/
virtual void
- decodeInterest(Interest& interest, const unsigned char *input, unsigned int inputLength);
+ decodeInterest(Interest& interest, const uint8_t *input, unsigned int inputLength);
/**
* Encode data with binary XML and return the encoding.
@@ -54,14 +54,14 @@
* @param inputLength The number of bytes in input.
* @param signedPortionBeginOffset Return the offset in the input buffer of the beginning of the signed portion.
* If you are not decoding in order to verify, you can call
- * decodeData(Data& data, const unsigned char *input, unsigned int inputLength) to ignore this returned value.
+ * decodeData(Data& data, const uint8_t *input, unsigned int inputLength) to ignore this returned value.
* @param signedPortionEndOffset Return the offset in the input buffer of the end of the signed portion.
* If you are not decoding in order to verify, you can call
- * decodeData(Data& data, const unsigned char *input, unsigned int inputLength) to ignore this returned value.
+ * decodeData(Data& data, const uint8_t *input, unsigned int inputLength) to ignore this returned value.
*/
virtual void
decodeData
- (Data& data, const unsigned char *input, unsigned int inputLength, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset);
+ (Data& data, const uint8_t *input, unsigned int inputLength, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset);
/**
* Encode forwardingEntry in binary XML and return the encoding.
@@ -78,7 +78,7 @@
* @param inputLength The number of bytes in input.
*/
virtual void
- decodeForwardingEntry(ForwardingEntry& forwardingEntry, const unsigned char *input, unsigned int inputLength);
+ decodeForwardingEntry(ForwardingEntry& forwardingEntry, const uint8_t *input, unsigned int inputLength);
};
}
diff --git a/ndn-cpp/encoding/wire-format.cpp b/ndn-cpp/encoding/wire-format.cpp
index 41c1f39..70644ad 100644
--- a/ndn-cpp/encoding/wire-format.cpp
+++ b/ndn-cpp/encoding/wire-format.cpp
@@ -35,7 +35,7 @@
}
void
-WireFormat::decodeInterest(Interest& interest, const unsigned char *input, unsigned int inputLength)
+WireFormat::decodeInterest(Interest& interest, const uint8_t *input, unsigned int inputLength)
{
throw logic_error("unimplemented");
}
@@ -48,7 +48,7 @@
void
WireFormat::decodeData
- (Data& data, const unsigned char *input, unsigned int inputLength, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset)
+ (Data& data, const uint8_t *input, unsigned int inputLength, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset)
{
throw logic_error("unimplemented");
}
@@ -60,7 +60,7 @@
}
void
-WireFormat::decodeForwardingEntry(ForwardingEntry& forwardingEntry, const unsigned char *input, unsigned int inputLength)
+WireFormat::decodeForwardingEntry(ForwardingEntry& forwardingEntry, const uint8_t *input, unsigned int inputLength)
{
throw logic_error("unimplemented");
}
diff --git a/ndn-cpp/encoding/wire-format.hpp b/ndn-cpp/encoding/wire-format.hpp
index 02e7a8c..489415b 100644
--- a/ndn-cpp/encoding/wire-format.hpp
+++ b/ndn-cpp/encoding/wire-format.hpp
@@ -35,7 +35,7 @@
* @throw logic_error for unimplemented if the derived class does not override.
*/
virtual void
- decodeInterest(Interest& interest, const unsigned char *input, unsigned int inputLength);
+ decodeInterest(Interest& interest, const uint8_t *input, unsigned int inputLength);
/**
* Encode data and return the encoding. Your derived class should override.
@@ -71,18 +71,18 @@
* @param inputLength The number of bytes in input.
* @param signedPortionBeginOffset Return the offset in the input buffer of the beginning of the signed portion.
* If you are not decoding in order to verify, you can call
- * decodeData(Data& data, const unsigned char *input, unsigned int inputLength) to ignore this returned value.
+ * decodeData(Data& data, const uint8_t *input, unsigned int inputLength) to ignore this returned value.
* @param signedPortionEndOffset Return the offset in the input buffer of the end of the signed portion.
* If you are not decoding in order to verify, you can call
- * decodeData(Data& data, const unsigned char *input, unsigned int inputLength) to ignore this returned value.
+ * decodeData(Data& data, const uint8_t *input, unsigned int inputLength) to ignore this returned value.
* @throw logic_error for unimplemented if the derived class does not override.
*/
virtual void
decodeData
- (Data& data, const unsigned char *input, unsigned int inputLength, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset);
+ (Data& data, const uint8_t *input, unsigned int inputLength, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset);
void
- decodeData(Data& data, const unsigned char *input, unsigned int inputLength)
+ decodeData(Data& data, const uint8_t *input, unsigned int inputLength)
{
unsigned int dummyBeginOffset, dummyEndOffset;
decodeData(data, input, inputLength, &dummyBeginOffset, &dummyEndOffset);
@@ -105,7 +105,7 @@
* @throw logic_error for unimplemented if the derived class does not override.
*/
virtual void
- decodeForwardingEntry(ForwardingEntry& forwardingEntry, const unsigned char *input, unsigned int inputLength);
+ decodeForwardingEntry(ForwardingEntry& forwardingEntry, const uint8_t *input, unsigned int inputLength);
/**
* Set the static default WireFormat used by default encoding and decoding methods.