diff options
| author | 2009-01-29 19:26:15 +0100 | |
|---|---|---|
| committer | 2009-01-29 19:26:15 +0100 | |
| commit | 296a38509d12306e423800ed2c583a94a31eddff (patch) | |
| tree | eab14f9e63eb03dc89607a7d4c1aa2ef00046a0f /src/bplist.c | |
| parent | 8c2751f8c7e696fca895aebfafc7e668f3afe85c (diff) | |
| download | libplist-296a38509d12306e423800ed2c583a94a31eddff.tar.gz libplist-296a38509d12306e423800ed2c583a94a31eddff.tar.bz2 | |
Clean some old stuff.
Diffstat (limited to 'src/bplist.c')
| -rw-r--r-- | src/bplist.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/bplist.c b/src/bplist.c index 78bbe4a..d05c2e5 100644 --- a/src/bplist.c +++ b/src/bplist.c | |||
| @@ -380,12 +380,6 @@ void plist_from_bin(const char *plist_bin, uint32_t length, plist_t * plist) | |||
| 380 | uint64_t root_object = be64dec(trailer + BPLIST_TRL_ROOTOBJ_IDX); | 380 | uint64_t root_object = be64dec(trailer + BPLIST_TRL_ROOTOBJ_IDX); |
| 381 | uint64_t offset_table_index = be64dec(trailer + BPLIST_TRL_OFFTAB_IDX); | 381 | uint64_t offset_table_index = be64dec(trailer + BPLIST_TRL_OFFTAB_IDX); |
| 382 | 382 | ||
| 383 | log_debug_msg("Offset size: %i\n", offset_size); | ||
| 384 | log_debug_msg("Ref size: %i\n", dict_param_size); | ||
| 385 | log_debug_msg("Number of objects: %lli\n", num_objects); | ||
| 386 | log_debug_msg("Root object index: %lli\n", root_object); | ||
| 387 | log_debug_msg("Offset table index: %lli\n", offset_table_index); | ||
| 388 | |||
| 389 | if (num_objects == 0) | 383 | if (num_objects == 0) |
| 390 | return; | 384 | return; |
| 391 | 385 | ||
| @@ -403,10 +397,8 @@ void plist_from_bin(const char *plist_bin, uint32_t length, plist_t * plist) | |||
| 403 | for (i = 0; i < num_objects; i++) { | 397 | for (i = 0; i < num_objects; i++) { |
| 404 | current_offset = UINT_TO_HOST(offset_table + i * offset_size, offset_size); | 398 | current_offset = UINT_TO_HOST(offset_table + i * offset_size, offset_size); |
| 405 | 399 | ||
| 406 | log_debug_msg("parse_nodes: current_offset = %i\n", current_offset); | ||
| 407 | char *obj = plist_bin + current_offset; | 400 | char *obj = plist_bin + current_offset; |
| 408 | nodeslist[i] = parse_bin_node(obj, dict_param_size, &obj); | 401 | nodeslist[i] = parse_bin_node(obj, dict_param_size, &obj); |
| 409 | log_debug_msg("parse_nodes: parse_raw_node done\n"); | ||
| 410 | } | 402 | } |
| 411 | 403 | ||
| 412 | //setup children for structured types | 404 | //setup children for structured types |
| @@ -415,12 +407,10 @@ void plist_from_bin(const char *plist_bin, uint32_t length, plist_t * plist) | |||
| 415 | 407 | ||
| 416 | for (i = 0; i < num_objects; i++) { | 408 | for (i = 0; i < num_objects; i++) { |
| 417 | 409 | ||
| 418 | log_debug_msg("parse_nodes: on node %i\n", i); | ||
| 419 | plist_data_t data = plist_get_data(nodeslist[i]); | 410 | plist_data_t data = plist_get_data(nodeslist[i]); |
| 420 | 411 | ||
| 421 | switch (data->type) { | 412 | switch (data->type) { |
| 422 | case PLIST_DICT: | 413 | case PLIST_DICT: |
| 423 | log_debug_msg("parse_nodes: dictionary found\n"); | ||
| 424 | for (j = 0; j < data->length; j++) { | 414 | for (j = 0; j < data->length; j++) { |
| 425 | str_i = j * dict_param_size; | 415 | str_i = j * dict_param_size; |
| 426 | str_j = (j + data->length) * dict_param_size; | 416 | str_j = (j + data->length) * dict_param_size; |
| @@ -450,7 +440,6 @@ void plist_from_bin(const char *plist_bin, uint32_t length, plist_t * plist) | |||
| 450 | break; | 440 | break; |
| 451 | 441 | ||
| 452 | case PLIST_ARRAY: | 442 | case PLIST_ARRAY: |
| 453 | log_debug_msg("parse_nodes: array found\n"); | ||
| 454 | for (j = 0; j < data->length; j++) { | 443 | for (j = 0; j < data->length; j++) { |
| 455 | str_j = j * dict_param_size; | 444 | str_j = j * dict_param_size; |
| 456 | index1 = UINT_TO_HOST(data->buff + str_j, dict_param_size); | 445 | index1 = UINT_TO_HOST(data->buff + str_j, dict_param_size); |
