From 448c063a4ade0713faccf6664f958072c8363f34 Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Thu, 24 Sep 2015 20:21:05 +0200
Subject: common: Remove plist_dict_merge() as it's already provided by
 libplist

Also, set libplist requirement to 1.12
---
 src/common.c | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'src/common.c')

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);
-}
-- 
cgit v1.1-32-gdbae