common: Remove plist_dict_merge() as it's already provided by libplist

Also, set libplist requirement to 1.12

2 files changed, 0 insertions, 28 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);
-}
diff --git a/src/common.h b/src/common.h
index f7c9fd2..8340d03 100644
--- a/src/common.h
+++ b/src/common.h
@@ -131,8 +131,6 @@ int mkdir_with_parents(const char *dir, int mode);
 
 void idevicerestore_progress(struct idevicerestore_client_t* client, int step, double progress);
 
-void plist_dict_merge(plist_t* dictionary, plist_t node);
-
 #ifdef __cplusplus
 }
 #endif