diff options
| author | Tao Bao <tbao@google.com> | 2015-07-14 03:00:26 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-14 03:00:27 +0200 |
| commit | 0bacbfd03c866b9078f86216e6786da91238ac91 (patch) | |
| tree | 47a62ed3cf643578280ddb1982599ed8345dd071 /applypatch/utils.cpp | |
| parent | Merge "Revert "Zero blocks before BLKDISCARD"" (diff) | |
| parent | recovery: Switch applypatch/ and updater/ to cpp. (diff) | |
| download | android_bootable_recovery-0bacbfd03c866b9078f86216e6786da91238ac91.tar android_bootable_recovery-0bacbfd03c866b9078f86216e6786da91238ac91.tar.gz android_bootable_recovery-0bacbfd03c866b9078f86216e6786da91238ac91.tar.bz2 android_bootable_recovery-0bacbfd03c866b9078f86216e6786da91238ac91.tar.lz android_bootable_recovery-0bacbfd03c866b9078f86216e6786da91238ac91.tar.xz android_bootable_recovery-0bacbfd03c866b9078f86216e6786da91238ac91.tar.zst android_bootable_recovery-0bacbfd03c866b9078f86216e6786da91238ac91.zip | |
Diffstat (limited to '')
| -rw-r--r-- | applypatch/utils.cpp (renamed from applypatch/utils.c) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/applypatch/utils.c b/applypatch/utils.cpp index 41ff676dc..4a80be75f 100644 --- a/applypatch/utils.c +++ b/applypatch/utils.cpp @@ -39,13 +39,13 @@ void Write8(long long value, FILE* f) { } int Read2(void* pv) { - unsigned char* p = pv; + unsigned char* p = reinterpret_cast<unsigned char*>(pv); return (int)(((unsigned int)p[1] << 8) | (unsigned int)p[0]); } int Read4(void* pv) { - unsigned char* p = pv; + unsigned char* p = reinterpret_cast<unsigned char*>(pv); return (int)(((unsigned int)p[3] << 24) | ((unsigned int)p[2] << 16) | ((unsigned int)p[1] << 8) | @@ -53,7 +53,7 @@ int Read4(void* pv) { } long long Read8(void* pv) { - unsigned char* p = pv; + unsigned char* p = reinterpret_cast<unsigned char*>(pv); return (long long)(((unsigned long long)p[7] << 56) | ((unsigned long long)p[6] << 48) | ((unsigned long long)p[5] << 40) | |