commit 7905c80940acfe796619631e74999202f3dd5394
author Koushik Dutta <koushd@gmail.com> Wed Jun 15 00:00:55 2011 -0700
committer Koushik Dutta <koushd@gmail.com> Wed Jun 15 00:00:55 2011 -0700
tree 51613e37cafa3d7ed33822012f0144904682a971
parent fcb87af7351e71c343188e20ea0b4457e32f2e01

bug fixes

Change-Id: I1125db9cb1a12a95060f7673965fd40994a78c5b

nandroid.c

diff --git a/nandroid.c b/nandroid.c
index 566b535..ae10ca8 100644
--- a/nandroid.c
+++ b/nandroid.c
@@ -315,13 +315,13 @@
     __system(tmp);
 }
 
-typedef int (*nandroid_restore_handler)(const char* backup_file_image, const char* backup_path, file_event_callback callback);
+typedef int (*nandroid_restore_handler)(const char* backup_file_image, const char* backup_path, int callback);
 
-static int unyaffs_wrapper(const char* backup_file_image, const char* backup_path, file_event_callback callback) {
+static int unyaffs_wrapper(const char* backup_file_image, const char* backup_path, int callback) {
     return unyaffs(backup_file_image, backup_path, callback);
 }
 
-static int tar_extract_wrapper(const char* backup_file_image, const char* backup_path, file_event_callback callback) {
+static int tar_extract_wrapper(const char* backup_file_image, const char* backup_path, int callback) {
     char tmp[PATH_MAX];
     sprintf(tmp, "cd $(dirname %s) ; tar xvf %s ; exit $?", backup_path, backup_file_image);
 
@@ -333,8 +333,8 @@
     }
 
     while (fgets(path, PATH_MAX, fp) != NULL) {
-        if (NULL != callback)
-            callback(path);
+        if (callback)
+            yaffs_callback(path);
     }
 
     return __pclose(fp);