liblog: logprint use <endian.h>
Change-Id: I0ec0fe3e954f6f04964d58e57c817d28057b630b
This commit is contained in:
parent
fa1c063feb
commit
66bfc5ccbd
1 changed files with 4 additions and 25 deletions
|
@ -415,27 +415,6 @@ 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.
|
||||
*
|
||||
|
@ -473,7 +452,7 @@ static int android_log_printBinaryEvent(const unsigned char** pEventData,
|
|||
|
||||
if (eventDataLen < 4)
|
||||
return -1;
|
||||
ival = get4LE(eventData);
|
||||
ival = le32toh(*((int32_t *)eventData));
|
||||
eventData += 4;
|
||||
eventDataLen -= 4;
|
||||
|
||||
|
@ -494,7 +473,7 @@ static int android_log_printBinaryEvent(const unsigned char** pEventData,
|
|||
|
||||
if (eventDataLen < 8)
|
||||
return -1;
|
||||
lval = get8LE(eventData);
|
||||
lval = le64toh(*((int64_t *)eventData));
|
||||
eventData += 8;
|
||||
eventDataLen -= 8;
|
||||
|
||||
|
@ -515,7 +494,7 @@ static int android_log_printBinaryEvent(const unsigned char** pEventData,
|
|||
|
||||
if (eventDataLen < 4)
|
||||
return -1;
|
||||
strLen = get4LE(eventData);
|
||||
strLen = le32toh(*((int32_t *)eventData));
|
||||
eventData += 4;
|
||||
eventDataLen -= 4;
|
||||
|
||||
|
@ -630,7 +609,7 @@ int android_log_processBinaryLogBuffer(struct logger_entry *buf,
|
|||
inCount = buf->len;
|
||||
if (inCount < 4)
|
||||
return -1;
|
||||
tagIndex = get4LE(eventData);
|
||||
tagIndex = le32toh(*((int32_t *)eventData));
|
||||
eventData += 4;
|
||||
inCount -= 4;
|
||||
|
||||
|
|
Loading…
Reference in a new issue