diff options
| author | Jaesung Chung <jaesung@google.com> | 2017-06-19 00:23:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-19 00:23:19 +0000 |
| commit | fe361ae7b3766d1d8e510ac605ae57f90df9a69c (patch) | |
| tree | 5de802e0c00b87afd7084049098d7fa672723d3d /logd | |
| parent | 3df484eeaba5a95fb0456389c06de3fbfcb5b641 (diff) | |
| parent | b9a1ff14ae3f2f99cc210222318ed53ddf5db3e2 (diff) | |
| download | system_core-fe361ae7b3766d1d8e510ac605ae57f90df9a69c.tar.gz system_core-fe361ae7b3766d1d8e510ac605ae57f90df9a69c.tar.bz2 system_core-fe361ae7b3766d1d8e510ac605ae57f90df9a69c.zip | |
Merge "logd-unit-tests: make sure use unsigned types when reading le" am: 31f2c81755
am: b9a1ff14ae
Change-Id: I2a780305fca0143ec863d1736d6ff74ff222eef2
Diffstat (limited to 'logd')
| -rw-r--r-- | logd/tests/logd_test.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/logd/tests/logd_test.cpp b/logd/tests/logd_test.cpp index cd802123e..4397b144c 100644 --- a/logd/tests/logd_test.cpp +++ b/logd/tests/logd_test.cpp @@ -933,8 +933,12 @@ TEST(logd, getEventTag_newentry) { } #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 |