summaryrefslogtreecommitdiffstats
path: root/src/bplist.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/bplist.c')
-rw-r--r--src/bplist.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/bplist.c b/src/bplist.c
index 85e55e2..08fca87 100644
--- a/src/bplist.c
+++ b/src/bplist.c
@@ -369,13 +369,13 @@ static plist_t parse_string_node(const char **bnode, uint64_t size)
369 return node_create(NULL, data); 369 return node_create(NULL, data);
370} 370}
371 371
372static char *plist_utf16be_to_utf8(uint16_t *unistr, long len, long *items_read, long *items_written) 372static char *plist_utf16be_to_utf8(uint16_t *unistr, size_t len, size_t *items_read, size_t *items_written)
373{ 373{
374 if (!unistr || (len <= 0)) return NULL; 374 if (!unistr || (len <= 0)) return NULL;
375 char* outbuf; 375 char* outbuf;
376 char* outbuf_new; 376 char* outbuf_new;
377 int p = 0; 377 size_t p = 0;
378 long i = 0; 378 size_t i = 0;
379 379
380 uint16_t wc; 380 uint16_t wc;
381 uint32_t w; 381 uint32_t w;
@@ -443,8 +443,8 @@ static char *plist_utf16be_to_utf8(uint16_t *unistr, long len, long *items_read,
443static plist_t parse_unicode_node(const char **bnode, uint64_t size) 443static plist_t parse_unicode_node(const char **bnode, uint64_t size)
444{ 444{
445 plist_data_t data = plist_new_plist_data(); 445 plist_data_t data = plist_new_plist_data();
446 long items_read = 0; 446 size_t items_read = 0;
447 long items_written = 0; 447 size_t items_written = 0;
448 448
449 data->type = PLIST_STRING; 449 data->type = PLIST_STRING;
450 data->strval = plist_utf16be_to_utf8((uint16_t*)(*bnode), size, &items_read, &items_written); 450 data->strval = plist_utf16be_to_utf8((uint16_t*)(*bnode), size, &items_read, &items_written);
@@ -1097,11 +1097,11 @@ static void write_string(bytearray_t * bplist, char *val, uint64_t size)
1097 write_raw_data(bplist, BPLIST_STRING, (uint8_t *) val, size); 1097 write_raw_data(bplist, BPLIST_STRING, (uint8_t *) val, size);
1098} 1098}
1099 1099
1100static uint16_t *plist_utf8_to_utf16be(char *unistr, long size, long *items_read, long *items_written) 1100static uint16_t *plist_utf8_to_utf16be(char *unistr, size_t size, size_t *items_read, size_t *items_written)
1101{ 1101{
1102 uint16_t *outbuf; 1102 uint16_t *outbuf;
1103 int p = 0; 1103 size_t p = 0;
1104 long i = 0; 1104 size_t i = 0;
1105 1105
1106 unsigned char c0; 1106 unsigned char c0;
1107 unsigned char c1; 1107 unsigned char c1;
@@ -1156,10 +1156,10 @@ static uint16_t *plist_utf8_to_utf16be(char *unistr, long size, long *items_read
1156 return outbuf; 1156 return outbuf;
1157} 1157}
1158 1158
1159static void write_unicode(bytearray_t * bplist, char *val, uint64_t size) 1159static void write_unicode(bytearray_t * bplist, char *val, size_t size)
1160{ 1160{
1161 long items_read = 0; 1161 size_t items_read = 0;
1162 long items_written = 0; 1162 size_t items_written = 0;
1163 uint16_t *unicodestr = NULL; 1163 uint16_t *unicodestr = NULL;
1164 1164
1165 unicodestr = plist_utf8_to_utf16be(val, size, &items_read, &items_written); 1165 unicodestr = plist_utf8_to_utf16be(val, size, &items_read, &items_written);