diff options
author | Nikias Bassen | 2024-05-13 19:38:22 +0200 |
---|---|---|
committer | Nikias Bassen | 2024-05-13 19:38:22 +0200 |
commit | 1327c87bf92f1d51286e3172c1047a8a47c5ee3a (patch) | |
tree | 8edf522f2d5b749027810c73b55270a3d3477dc3 /src | |
parent | 06877b5ecb9704baded1160a149912fad8141a39 (diff) | |
download | libplist-1327c87bf92f1d51286e3172c1047a8a47c5ee3a.tar.gz libplist-1327c87bf92f1d51286e3172c1047a8a47c5ee3a.tar.bz2 |
Revert "Change API around #PLIST_DATA to use uint8_t instead of char arrays"
This reverts commit a91f5740d100414a76959714b819422ee5b2d8a8.
Diffstat (limited to 'src')
-rw-r--r-- | src/Data.cpp | 12 | ||||
-rw-r--r-- | src/plist.c | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/Data.cpp b/src/Data.cpp index c4709f7..a96fc50 100644 --- a/src/Data.cpp +++ b/src/Data.cpp @@ -34,7 +34,7 @@ Data::Data(plist_t node, Node* parent) : Node(node, parent) Data::Data(const PList::Data& d) : Node(PLIST_DATA) { - std::vector<uint8_t> b = d.GetValue(); + std::vector<char> b = d.GetValue(); plist_set_data_val(_node, &b[0], b.size()); } @@ -45,7 +45,7 @@ Data& Data::operator=(const PList::Data& b) return *this; } -Data::Data(const std::vector<uint8_t>& buff) : Node(PLIST_DATA) +Data::Data(const std::vector<char>& buff) : Node(PLIST_DATA) { plist_set_data_val(_node, &buff[0], buff.size()); } @@ -59,17 +59,17 @@ Node* Data::Clone() const return new Data(*this); } -void Data::SetValue(const std::vector<uint8_t>& buff) +void Data::SetValue(const std::vector<char>& buff) { plist_set_data_val(_node, &buff[0], buff.size()); } -std::vector<uint8_t> Data::GetValue() const +std::vector<char> Data::GetValue() const { - uint8_t* buff = NULL; + char* buff = NULL; uint64_t length = 0; plist_get_data_val(_node, &buff, &length); - std::vector<uint8_t> ret(buff, buff + length); + std::vector<char> ret(buff, buff + length); delete buff; return ret; } diff --git a/src/plist.c b/src/plist.c index d1b0b5a..a425466 100644 --- a/src/plist.c +++ b/src/plist.c @@ -544,7 +544,7 @@ plist_t plist_new_real(double val) return plist_new_node(data); } -plist_t plist_new_data(const uint8_t *val, uint64_t length) +plist_t plist_new_data(const char *val, uint64_t length) { plist_data_t data = plist_new_plist_data(); data->type = PLIST_DATA; @@ -1385,7 +1385,7 @@ void plist_get_real_val(plist_t node, double *val) assert(length == sizeof(double)); } -void plist_get_data_val(plist_t node, uint8_t **val, uint64_t * length) +void plist_get_data_val(plist_t node, char **val, uint64_t * length) { if (!node || !val || !length) return; @@ -1395,7 +1395,7 @@ void plist_get_data_val(plist_t node, uint8_t **val, uint64_t * length) plist_get_type_and_value(node, &type, (void *) val, length); } -const uint8_t* plist_get_data_ptr(plist_t node, uint64_t* length) +const char* plist_get_data_ptr(plist_t node, uint64_t* length) { if (!node || !length) return NULL; @@ -1404,7 +1404,7 @@ const uint8_t* plist_get_data_ptr(plist_t node, uint64_t* length) return NULL; plist_data_t data = plist_get_data(node); *length = data->length; - return data->buff; + return (const char*)data->buff; } void plist_get_date_val(plist_t node, int32_t * sec, int32_t * usec) @@ -1575,7 +1575,7 @@ void plist_set_real_val(plist_t node, double val) plist_set_element_val(node, PLIST_REAL, &val, sizeof(double)); } -void plist_set_data_val(plist_t node, const uint8_t *val, uint64_t length) +void plist_set_data_val(plist_t node, const char *val, uint64_t length) { plist_set_element_val(node, PLIST_DATA, val, length); } |