summaryrefslogtreecommitdiffstats
path: root/applypatch/utils.cpp
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2016-04-19 00:34:41 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-04-19 00:34:41 +0200
commit0231e7016dfe56625d6d01a1de468cd23d9cf01a (patch)
tree543fc407741ac3df540e3bfe4c36688e3bda6d80 /applypatch/utils.cpp
parentMerge "Fix IWYU errors." am: 51dcd0d (diff)
parentMerge "Fix google-runtime-int warnings." (diff)
downloadandroid_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.gz
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.bz2
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.lz
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.xz
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.zst
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.zip
Diffstat (limited to 'applypatch/utils.cpp')
-rw-r--r--applypatch/utils.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/applypatch/utils.cpp b/applypatch/utils.cpp
index 4a80be75f..fef250f01 100644
--- a/applypatch/utils.cpp
+++ b/applypatch/utils.cpp
@@ -27,7 +27,7 @@ void Write4(int value, FILE* f) {
}
/** Write an 8-byte value to f in little-endian order. */
-void Write8(long long value, FILE* f) {
+void Write8(int64_t value, FILE* f) {
fputc(value & 0xff, f);
fputc((value >> 8) & 0xff, f);
fputc((value >> 16) & 0xff, f);
@@ -52,14 +52,14 @@ int Read4(void* pv) {
(unsigned int)p[0]);
}
-long long Read8(void* pv) {
+int64_t Read8(void* 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) |
- ((unsigned long long)p[4] << 32) |
- ((unsigned long long)p[3] << 24) |
- ((unsigned long long)p[2] << 16) |
- ((unsigned long long)p[1] << 8) |
- (unsigned long long)p[0]);
+ return (int64_t)(((uint64_t)p[7] << 56) |
+ ((uint64_t)p[6] << 48) |
+ ((uint64_t)p[5] << 40) |
+ ((uint64_t)p[4] << 32) |
+ ((uint64_t)p[3] << 24) |
+ ((uint64_t)p[2] << 16) |
+ ((uint64_t)p[1] << 8) |
+ (uint64_t)p[0]);
}