diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bplist.c | 10 | ||||
| -rw-r--r-- | src/plist.c | 8 | ||||
| -rw-r--r-- | src/plist.h | 1 |
3 files changed, 5 insertions, 14 deletions
diff --git a/src/bplist.c b/src/bplist.c index 67d7f72..0140f88 100644 --- a/src/bplist.c +++ b/src/bplist.c | |||
| @@ -268,7 +268,7 @@ static plist_t parse_bin_node(char *object, uint8_t dict_size, char **next_objec | |||
| 268 | plist_t size_node = parse_bin_node(object, dict_size, &object); | 268 | plist_t size_node = parse_bin_node(object, dict_size, &object); |
| 269 | if (plist_get_node_type(size_node) != PLIST_UINT) | 269 | if (plist_get_node_type(size_node) != PLIST_UINT) |
| 270 | return NULL; | 270 | return NULL; |
| 271 | size = plist_get_node_uint_val(size_node); | 271 | plist_get_uint_val(size_node, &size); |
| 272 | } | 272 | } |
| 273 | return parse_data_node(object, size); | 273 | return parse_data_node(object, size); |
| 274 | 274 | ||
| @@ -277,7 +277,7 @@ static plist_t parse_bin_node(char *object, uint8_t dict_size, char **next_objec | |||
| 277 | plist_t size_node = parse_bin_node(object, dict_size, &object); | 277 | plist_t size_node = parse_bin_node(object, dict_size, &object); |
| 278 | if (plist_get_node_type(size_node) != PLIST_UINT) | 278 | if (plist_get_node_type(size_node) != PLIST_UINT) |
| 279 | return NULL; | 279 | return NULL; |
| 280 | size = plist_get_node_uint_val(size_node); | 280 | plist_get_uint_val(size_node, &size); |
| 281 | } | 281 | } |
| 282 | return parse_string_node(object, size); | 282 | return parse_string_node(object, size); |
| 283 | 283 | ||
| @@ -286,7 +286,7 @@ static plist_t parse_bin_node(char *object, uint8_t dict_size, char **next_objec | |||
| 286 | plist_t size_node = parse_bin_node(object, dict_size, &object); | 286 | plist_t size_node = parse_bin_node(object, dict_size, &object); |
| 287 | if (plist_get_node_type(size_node) != PLIST_UINT) | 287 | if (plist_get_node_type(size_node) != PLIST_UINT) |
| 288 | return NULL; | 288 | return NULL; |
| 289 | size = plist_get_node_uint_val(size_node); | 289 | plist_get_uint_val(size_node, &size); |
| 290 | } | 290 | } |
| 291 | return parse_unicode_node(object, size); | 291 | return parse_unicode_node(object, size); |
| 292 | 292 | ||
| @@ -296,7 +296,7 @@ static plist_t parse_bin_node(char *object, uint8_t dict_size, char **next_objec | |||
| 296 | plist_t size_node = parse_bin_node(object, dict_size, &object); | 296 | plist_t size_node = parse_bin_node(object, dict_size, &object); |
| 297 | if (plist_get_node_type(size_node) != PLIST_UINT) | 297 | if (plist_get_node_type(size_node) != PLIST_UINT) |
| 298 | return NULL; | 298 | return NULL; |
| 299 | size = plist_get_node_uint_val(size_node); | 299 | plist_get_uint_val(size_node, &size); |
| 300 | } | 300 | } |
| 301 | return parse_array_node(object, size, dict_size); | 301 | return parse_array_node(object, size, dict_size); |
| 302 | 302 | ||
| @@ -306,7 +306,7 @@ static plist_t parse_bin_node(char *object, uint8_t dict_size, char **next_objec | |||
| 306 | plist_t size_node = parse_bin_node(object, dict_size, &object); | 306 | plist_t size_node = parse_bin_node(object, dict_size, &object); |
| 307 | if (plist_get_node_type(size_node) != PLIST_UINT) | 307 | if (plist_get_node_type(size_node) != PLIST_UINT) |
| 308 | return NULL; | 308 | return NULL; |
| 309 | size = plist_get_node_uint_val(size_node); | 309 | plist_get_uint_val(size_node, &size); |
| 310 | } | 310 | } |
| 311 | return parse_dict_node(object, size, dict_size); | 311 | return parse_dict_node(object, size, dict_size); |
| 312 | default: | 312 | default: |
diff --git a/src/plist.c b/src/plist.c index 709f12d..5fc2338 100644 --- a/src/plist.c +++ b/src/plist.c | |||
| @@ -251,14 +251,6 @@ plist_type plist_get_node_type(plist_t node) | |||
| 251 | return PLIST_NONE; | 251 | return PLIST_NONE; |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | uint64_t plist_get_node_uint_val(plist_t node) | ||
| 255 | { | ||
| 256 | if (PLIST_UINT == plist_get_node_type(node)) | ||
| 257 | return plist_get_data(node)->intval; | ||
| 258 | else | ||
| 259 | return 0; | ||
| 260 | } | ||
| 261 | |||
| 262 | void plist_add_sub_node(plist_t node, plist_t subnode) | 254 | void plist_add_sub_node(plist_t node, plist_t subnode) |
| 263 | { | 255 | { |
| 264 | if (node && subnode) { | 256 | if (node && subnode) { |
diff --git a/src/plist.h b/src/plist.h index 319647d..7596992 100644 --- a/src/plist.h +++ b/src/plist.h | |||
| @@ -55,7 +55,6 @@ plist_t plist_new_node(plist_data_t data); | |||
| 55 | plist_data_t plist_get_data(const plist_t node); | 55 | plist_data_t plist_get_data(const plist_t node); |
| 56 | plist_data_t plist_new_plist_data(); | 56 | plist_data_t plist_new_plist_data(); |
| 57 | void plist_free_plist_data(plist_data_t node); | 57 | void plist_free_plist_data(plist_data_t node); |
| 58 | uint64_t plist_get_node_uint_val(plist_t node); | ||
| 59 | 58 | ||
| 60 | plist_t plist_add_sub_element( plist_t node, plist_type type, const void* value, uint64_t length); | 59 | plist_t plist_add_sub_element( plist_t node, plist_type type, const void* value, uint64_t length); |
| 61 | plist_t plist_find_node(plist_t plist, plist_type type, const void *value, uint64_t length); | 60 | plist_t plist_find_node(plist_t plist, plist_type type, const void *value, uint64_t length); |
