commit 55e5e7b59a198fe8012fad8934f85fd97be33b4a
author Koushik Dutta <koushd@gmail.com> Tue Jun 14 23:39:59 2011 -0700
committer Koushik Dutta <koushd@gmail.com> Tue Jun 14 23:39:59 2011 -0700
tree d5062e85b1b8a805a45d2e7bfdf271b5966c6772
parent 7126ef404cea011623bb836f27783924d843da75

cleanups for tar and /data/media support

Change-Id: I4afe3a8d4484f91b1e689d7b3aa4f137acd66e93

nandroid.c

diff --git a/nandroid.c b/nandroid.c
index 5a32a76..566b535 100644
--- a/nandroid.c
+++ b/nandroid.c
@@ -98,13 +98,13 @@
 }
 
 typedef void (*file_event_callback)(const char* filename);
-typedef int (*nandroid_backup_handler)(const char* backup_path, const char* backup_file_image, const file_event_callback callback);
+typedef int (*nandroid_backup_handler)(const char* backup_path, const char* backup_file_image, int callback);
 
-static int mkyaffs2image_wrapper(const char* backup_path, const char* backup_file_image, const file_event_callback callback) {
+static int mkyaffs2image_wrapper(const char* backup_path, const char* backup_file_image, int callback) {
     return mkyaffs2image(backup_path, backup_file_image, 0, callback);
 }
 
-static int tar_compress_wrapper(const char* backup_path, const char* backup_file_image, const file_event_callback callback) {
+static int tar_compress_wrapper(const char* backup_path, const char* backup_file_image, int callback) {
     char tmp[PATH_MAX];
     if (strcmp(backup_path, "/data") == 0 && volume_for_path("/sdcard") == NULL)
       sprintf(tmp, "cd $(dirname %s) ; tar cvf %s --exclude 'media' $(basename %s) ; exit $?", backup_path, backup_file_image, backup_path);
@@ -119,7 +119,7 @@
 
     while (fgets(tmp, PATH_MAX, fp) != NULL) {
         tmp[PATH_MAX - 1] = NULL;
-        if (NULL != callback)
+        if (callback)
             yaffs_callback(tmp);
     }
 
@@ -163,10 +163,7 @@
     char* name = basename(mount_point);
 
     struct stat file_info;
-    file_event_callback callback = NULL;
-    if (0 != stat("/sdcard/clockworkmod/.hidenandroidprogress", &file_info)) {
-        callback = yaffs_callback;
-    }
+    int callback = stat("/sdcard/clockworkmod/.hidenandroidprogress", &file_info) == 0;
     
     ui_print("Backing up %s...\n", name);
     if (0 != (ret = ensure_path_mounted(mount_point) != 0)) {
@@ -388,10 +385,7 @@
 
     ensure_directory(mount_point);
 
-    file_event_callback callback = NULL;
-    if (0 != stat("/sdcard/clockworkmod/.hidenandroidprogress", &file_info)) {
-        callback = yaffs_callback;
-    }
+    int callback = stat("/sdcard/clockworkmod/.hidenandroidprogress", &file_info) == 0;
 
     ui_print("Restoring %s...\n", name);
     /*