From efd0fab04b96d7ab0c1d8bf3b79397c8621e31c5 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Wed, 17 Jun 2009 16:20:55 -0700 Subject: FileRestoreHelper and RestoreHelperDispatcher work. --- libs/utils/BackupData.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/utils/BackupData.cpp') diff --git a/libs/utils/BackupData.cpp b/libs/utils/BackupData.cpp index 16ff1e55e112..34b37edd28a0 100644 --- a/libs/utils/BackupData.cpp +++ b/libs/utils/BackupData.cpp @@ -281,16 +281,16 @@ BackupDataReader::SkipEntityData() } } -status_t +ssize_t BackupDataReader::ReadEntityData(void* data, size_t size) { if (m_status != NO_ERROR) { return m_status; } int remaining = m_dataEndPos - m_pos; + //LOGD("ReadEntityData size=%d m_pos=0x%x m_dataEndPos=0x%x remaining=%d\n", + // size, m_pos, m_dataEndPos, remaining); if (size > remaining) { - printf("size=%d m_pos=0x%x m_dataEndPos=0x%x remaining=%d\n", - size, m_pos, m_dataEndPos, remaining); size = remaining; } if (remaining <= 0) { @@ -299,7 +299,7 @@ BackupDataReader::ReadEntityData(void* data, size_t size) int amt = read(m_fd, data, size); CHECK_SIZE(amt, (int)size); m_pos += size; - return NO_ERROR; + return amt; } status_t -- cgit v1.2.3-59-g8ed1b