diff options
author | Joe Onorato <joeo@android.com> | 2009-06-16 16:31:35 -0400 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2009-06-16 18:46:50 -0700 |
commit | 5f15d151b5101fadfe6cba1e8f4aa6367e8c603e (patch) | |
tree | 3a94295ffc2935c7ca1550c01a6e793766bf415f /cmds/backup | |
parent | aa088447baadd2e0bbcfd18cc529645610c13ddc (diff) | |
download | frameworks_base-5f15d151b5101fadfe6cba1e8f4aa6367e8c603e.zip frameworks_base-5f15d151b5101fadfe6cba1e8f4aa6367e8c603e.tar.gz frameworks_base-5f15d151b5101fadfe6cba1e8f4aa6367e8c603e.tar.bz2 |
checkpoint BackupDatAInput / RestoreHelper
Diffstat (limited to 'cmds/backup')
-rw-r--r-- | cmds/backup/backup.cpp | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/cmds/backup/backup.cpp b/cmds/backup/backup.cpp index 22dd486..d4e669b 100644 --- a/cmds/backup/backup.cpp +++ b/cmds/backup/backup.cpp @@ -64,22 +64,14 @@ perform_list(const char* filename) } BackupDataReader reader(fd); + bool done; int type; - while (reader.ReadNextHeader(&type) == 0) { + while (reader.ReadNextHeader(&done, &type) == 0) { + if (done) { + break; + } switch (type) { - case BACKUP_HEADER_APP_V1: - { - String8 packageName; - int cookie; - err = reader.ReadAppHeader(&packageName, &cookie); - if (err == 0) { - printf("App header: %s 0x%08x (%d)\n", packageName.string(), cookie, cookie); - } else { - printf("Error reading app header\n"); - } - break; - } case BACKUP_HEADER_ENTITY_V1: { String8 key; @@ -92,17 +84,6 @@ perform_list(const char* filename) } break; } - case BACKUP_FOOTER_APP_V1: - { - int cookie; - err = reader.ReadAppFooter(&cookie); - if (err == 0) { - printf(" App footer: 0x%08x (%d)\n", cookie, cookie); - } else { - printf(" Error reading entity header\n"); - } - break; - } default: { printf("Unknown chunk type: 0x%08x\n", type); |