diff options
author | Nikias Bassen | 2015-09-24 20:21:05 +0200 |
---|---|---|
committer | Nikias Bassen | 2015-09-24 20:21:05 +0200 |
commit | 448c063a4ade0713faccf6664f958072c8363f34 (patch) | |
tree | f0063360e7d448556dc74a4e9e2816dd8fa3f1c8 /src/common.c | |
parent | 719b964e80e330001e4004c0d2deba3e0a6ed05c (diff) | |
download | idevicerestore-448c063a4ade0713faccf6664f958072c8363f34.tar.gz idevicerestore-448c063a4ade0713faccf6664f958072c8363f34.tar.bz2 |
common: Remove plist_dict_merge() as it's already provided by libplist
Also, set libplist requirement to 1.12
Diffstat (limited to 'src/common.c')
-rw-r--r-- | src/common.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/common.c b/src/common.c index efc8431..a36d222 100644 --- a/src/common.c +++ b/src/common.c @@ -282,29 +282,3 @@ void idevicerestore_progress(struct idevicerestore_client_t* client, int step, d } } } - -void plist_dict_merge(plist_t* dictionary, plist_t node) -{ - if (dictionary == NULL || (plist_get_node_type(*dictionary) != PLIST_DICT)) - return; - - char* key = NULL; - plist_dict_iter it = NULL; - plist_t subnode = NULL; - plist_dict_new_iter(node, &it); - plist_dict_next_item(node, it, &key, &subnode); - - while (subnode) - { - if (plist_dict_get_item(*dictionary, key) != NULL) - plist_dict_remove_item(*dictionary, key); - - plist_dict_set_item(*dictionary, key, plist_copy(subnode)); - if (key) { - free(key); - key = NULL; - } - plist_dict_next_item(node, it, &key, &subnode); - } - free(it); -} |