From 2a2934ca1568dffe69da9a20420c7c0c71376bce Mon Sep 17 00:00:00 2001
From: Joshua Hill
Date: Sun, 20 Jun 2010 22:12:31 -0400
Subject: fixed a few build errors within buildmanifest parsing

---
 src/idevicerestore.c | 15 ++++++++-------
 src/recovery.c       |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/idevicerestore.c b/src/idevicerestore.c
index ca02dfa..c801266 100644
--- a/src/idevicerestore.c
+++ b/src/idevicerestore.c
@@ -85,19 +85,19 @@ int get_build_count(plist_t buildmanifest) {
 	return plist_array_get_size(build_identities_array);
 }
 
-const char* get_build_name(plist build_identity, int identity) {
+const char* get_build_name(plist_t build_identity, int identity) {
 	plist_t manifest_node = plist_dict_get_item(build_identity, "Manifest");
 	if (!manifest_node || plist_get_node_type(manifest_node) != PLIST_DICT) {
 		error("ERROR: Unable to find restore manifest\n");
-		plist_free(tss_request);
 		return NULL;
 	}
 
-	plist_t filesystem_info_node = plist_dict_get_item(filesystem_node, "Info");
+	plist_t filesystem_info_node = plist_dict_get_item(manifest_node, "Info");
 	if (!filesystem_info_node || plist_get_node_type(filesystem_info_node) != PLIST_DICT) {
 		error("ERROR: Unable to find filesystem info node\n");
-		return -1;
+		return NULL;
 	}
+	return NULL;
 }
 
 int main(int argc, char* argv[]) {
@@ -199,6 +199,7 @@ int main(int argc, char* argv[]) {
 	}
 
 	// choose whether this is an upgrade or a restore (default to upgrade)
+	plist_t tss = NULL;
 	plist_t build_identity = NULL;
 	if (idevicerestore_erase) {
 		build_identity = get_build_identity(buildmanifest, 0);
@@ -211,16 +212,17 @@ int main(int argc, char* argv[]) {
 	} else {
 		// loop through all build identities in the build manifest
 		// and list the valid ones
+		int i = 0;
 		int valid_builds = 0;
 		int build_count = get_build_count(buildmanifest);
 		for(i = 0; i < build_count; i++) {
 			if (idevicerestore_device->device_id > DEVICE_IPOD2G) {
-				if (get_shsh_blobs(ecid, i, &tss) < 0) {
+				if (get_shsh_blobs(ecid, buildmanifest, &tss) < 0) {
 					// if this fails then no SHSH blobs have been saved
 					// for this build identity, so check the next one
 					continue;
 				}
-				info("[%d] %s\n" i, get_build_name(buildmanifest, i));
+				info("[%d] %s\n", i, get_build_name(buildmanifest, i));
 				valid_builds++;
 			}
 		}
@@ -229,7 +231,6 @@ int main(int argc, char* argv[]) {
 	// devices are listed in order from oldest to newest
 	// devices that come after iPod2g require personalized firmwares
 	plist_t tss_request = NULL;
-	plist_t tss = NULL;
 	if (idevicerestore_device->device_id > DEVICE_IPOD2G) {
 		info("Creating TSS request\n");
 		// fetch the device's ECID for the TSS request
diff --git a/src/recovery.c b/src/recovery.c
index cc523f5..88d385f 100644
--- a/src/recovery.c
+++ b/src/recovery.c
@@ -158,7 +158,7 @@ int recovery_open_with_timeout(irecv_client_t* client) {
 	}
 
 	if (idevicerestore_debug) {
-		irecv_set_debug(recovery, idevicerestore_debug);
+		irecv_set_debug_level(idevicerestore_debug);
 	}
 
 	irecv_event_subscribe(recovery, IRECV_PROGRESS, &recovery_progress_callback, NULL);
-- 
cgit v1.1-32-gdbae