summaryrefslogtreecommitdiffstats
path: root/src/plist.c
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2024-04-14 18:19:14 +0200
committerGravatar Nikias Bassen2024-04-14 18:19:14 +0200
commita91f5740d100414a76959714b819422ee5b2d8a8 (patch)
tree087400da3ed5af11ef1f4806ffc58a9a3a090323 /src/plist.c
parent612cdf3ffd3e8c200e4a21ec15e3b3f0af170b42 (diff)
downloadlibplist-a91f5740d100414a76959714b819422ee5b2d8a8.tar.gz
libplist-a91f5740d100414a76959714b819422ee5b2d8a8.tar.bz2
Change API around #PLIST_DATA to use uint8_t instead of char arrays
This makes it more obvious that it is arbitrary data and not necessarily a string value.
Diffstat (limited to 'src/plist.c')
-rw-r--r--src/plist.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plist.c b/src/plist.c
index 2078520..57f5ead 100644
--- a/src/plist.c
+++ b/src/plist.c
@@ -35,6 +35,7 @@
35#include <limits.h> 35#include <limits.h>
36#include <float.h> 36#include <float.h>
37#include <ctype.h> 37#include <ctype.h>
38#include <inttypes.h>
38 39
39#ifdef WIN32 40#ifdef WIN32
40#include <windows.h> 41#include <windows.h>
@@ -490,7 +491,7 @@ plist_t plist_new_real(double val)
490 return plist_new_node(data); 491 return plist_new_node(data);
491} 492}
492 493
493plist_t plist_new_data(const char *val, uint64_t length) 494plist_t plist_new_data(const uint8_t *val, uint64_t length)
494{ 495{
495 plist_data_t data = plist_new_plist_data(); 496 plist_data_t data = plist_new_plist_data();
496 data->type = PLIST_DATA; 497 data->type = PLIST_DATA;
@@ -1142,7 +1143,7 @@ void plist_get_real_val(plist_t node, double *val)
1142 assert(length == sizeof(double)); 1143 assert(length == sizeof(double));
1143} 1144}
1144 1145
1145void plist_get_data_val(plist_t node, char **val, uint64_t * length) 1146void plist_get_data_val(plist_t node, uint8_t **val, uint64_t * length)
1146{ 1147{
1147 if (!node || !val || !length) 1148 if (!node || !val || !length)
1148 return; 1149 return;
@@ -1152,7 +1153,7 @@ void plist_get_data_val(plist_t node, char **val, uint64_t * length)
1152 plist_get_type_and_value(node, &type, (void *) val, length); 1153 plist_get_type_and_value(node, &type, (void *) val, length);
1153} 1154}
1154 1155
1155const char* plist_get_data_ptr(plist_t node, uint64_t* length) 1156const uint8_t* plist_get_data_ptr(plist_t node, uint64_t* length)
1156{ 1157{
1157 if (!node || !length) 1158 if (!node || !length)
1158 return NULL; 1159 return NULL;
@@ -1161,7 +1162,7 @@ const char* plist_get_data_ptr(plist_t node, uint64_t* length)
1161 return NULL; 1162 return NULL;
1162 plist_data_t data = plist_get_data(node); 1163 plist_data_t data = plist_get_data(node);
1163 *length = data->length; 1164 *length = data->length;
1164 return (const char*)data->buff; 1165 return data->buff;
1165} 1166}
1166 1167
1167void plist_get_date_val(plist_t node, int32_t * sec, int32_t * usec) 1168void plist_get_date_val(plist_t node, int32_t * sec, int32_t * usec)
@@ -1332,7 +1333,7 @@ void plist_set_real_val(plist_t node, double val)
1332 plist_set_element_val(node, PLIST_REAL, &val, sizeof(double)); 1333 plist_set_element_val(node, PLIST_REAL, &val, sizeof(double));
1333} 1334}
1334 1335
1335void plist_set_data_val(plist_t node, const char *val, uint64_t length) 1336void plist_set_data_val(plist_t node, const uint8_t *val, uint64_t length)
1336{ 1337{
1337 plist_set_element_val(node, PLIST_DATA, val, length); 1338 plist_set_element_val(node, PLIST_DATA, val, length);
1338} 1339}