commit 33070a58c68d6523c852890d450f7f3f656bff91
author Mark Salyzyn <salyzyn@google.com> Tue Mar 03 15:23:24 2015 -0800
committer Mark Salyzyn <salyzyn@google.com> Wed Mar 04 12:48:04 2015 -0800
tree 43eae354b5c268486a3d763f7ab8d08a203fe797
parent 38cdc8f172ed01a6180861c3bd12e4d1a99e6116

liblog: logprint use <endian.h>

Change-Id: I0ec0fe3e954f6f04964d58e57c817d28057b630b

liblog/logprint.c

diff --git a/liblog/logprint.c b/liblog/logprint.c
index 7ba4c8e..8093a4c 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -416,27 +416,6 @@
 }
 
 /*
- * 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.
  *
  * This needs to be recursive because you can have lists of lists.
@@ -473,7 +452,7 @@
 
             if (eventDataLen < 4)
                 return -1;
-            ival = get4LE(eventData);
+            ival = le32toh(*((int32_t *)eventData));
             eventData += 4;
             eventDataLen -= 4;
 
@@ -494,7 +473,7 @@
 
             if (eventDataLen < 8)
                 return -1;
-            lval = get8LE(eventData);
+            lval = le64toh(*((int64_t *)eventData));
             eventData += 8;
             eventDataLen -= 8;
 
@@ -515,7 +494,7 @@
 
             if (eventDataLen < 4)
                 return -1;
-            strLen = get4LE(eventData);
+            strLen = le32toh(*((int32_t *)eventData));
             eventData += 4;
             eventDataLen -= 4;
 
@@ -630,7 +609,7 @@
     inCount = buf->len;
     if (inCount < 4)
         return -1;
-    tagIndex = get4LE(eventData);
+    tagIndex = le32toh(*((int32_t *)eventData));
     eventData += 4;
     inCount -= 4;