tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "liblog: logprint use <endian.h>""

Browse source
This commit is contained in:
Mark Salyzyn 2015-03-06 20:52:52 +00:00 committed by Gerrit Code Review
commit 4f0520fe6c
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
liblog/logprint.c
View file

@ -20,7 +20,6 @@
#include <arpa/inet.h>
#include <assert.h>
#include <ctype.h>
#include <endian.h>
#include <errno.h>
#include <stdbool.h>
#include <stdint.h>
@ -416,6 +415,27 @@ int android_log_processLogBuffer(struct logger_entry *buf,
return 0;
}
/*
* Extract a 4-byte value from a byte stream.
*/
static inline uint32_t get4LE(const uint8_t* src)
{
return src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24);
}
/*
* Extract an 8-byte value from a byte stream.
*/
static inline uint64_t get8LE(const uint8_t* src)
{
uint32_t low, high;
low = src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24);
high = src[4] | (src[5] << 8) | (src[6] << 16) | (src[7] << 24);
return ((long long) high << 32) | (long long) low;
}
/*
* Recursively convert binary log data to printable form.
*
@ -453,7 +473,7 @@ static int android_log_printBinaryEvent(const unsigned char** pEventData,
if (eventDataLen < 4)
return -1;
ival = le32toh(*((int32_t *)eventData));
ival = get4LE(eventData);
eventData += 4;
eventDataLen -= 4;
@ -474,7 +494,7 @@ static int android_log_printBinaryEvent(const unsigned char** pEventData,
if (eventDataLen < 8)
return -1;
lval = le64toh(*((int64_t *)eventData));
lval = get8LE(eventData);
eventData += 8;
eventDataLen -= 8;
@ -495,7 +515,7 @@ static int android_log_printBinaryEvent(const unsigned char** pEventData,
if (eventDataLen < 4)
return -1;
strLen = le32toh(*((int32_t *)eventData));
strLen = get4LE(eventData);
eventData += 4;
eventDataLen -= 4;
@ -610,7 +630,7 @@ int android_log_processBinaryLogBuffer(struct logger_entry *buf,
inCount = buf->len;
if (inCount < 4)
return -1;
tagIndex = le32toh(*((int32_t *)eventData));
tagIndex = get4LE(eventData);
eventData += 4;
inCount -= 4;