checkpoint BackupDatAInput / RestoreHelper
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 @@
}
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 @@
}
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);