commit 812848cb448554e2de75c4ad919c7a31914338b1
author Jaesung Chung <jaesung@google.com> Mon Jun 19 00:18:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 19 00:18:23 2017 +0000
tree def0688f15ef8989788f59be3705caebbb411ec8
parent ee542269534f206bec2bbae87e0e5a5640c2b963
parent dbc5da80fd30bd0ddfa307e54b4c345855c0a3d8

Merge "logd-unit-tests: make sure use unsigned types when reading le"
am: 31f2c81755

Change-Id: If4ad61346df17727e39bf0aa26c4dc96f8feeb24

logd/tests/logd_test.cpp

diff --git a/logd/tests/logd_test.cpp b/logd/tests/logd_test.cpp
index cd80212..4397b14 100644
--- a/logd/tests/logd_test.cpp
+++ b/logd/tests/logd_test.cpp
@@ -933,8 +933,12 @@
 }
 
 #ifdef __ANDROID__
-static inline int32_t get4LE(const char* src) {
-    return src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24);
+static inline uint32_t get4LE(const uint8_t* src) {
+  return src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24);
+}
+
+static inline uint32_t get4LE(const char* src) {
+  return get4LE(reinterpret_cast<const uint8_t*>(src));
 }
 #endif