commit 8aceb8fcd434ed95fb9b3d9bcfe2149a6adb1444
author Chih-Hung Hsieh <chh@google.com> Wed May 06 14:52:23 2015 -0700
committer Chih-Hung Hsieh <chh@google.com> Thu May 07 15:39:39 2015 -0700
tree 056c289f52e49707aa7d2ed7c20c19cd81a3a48f
parent ec9fd1d44227dc0e8538153214eae9e7cedb66ab

Fix clang warnings on unused variable and function.

BUG: 20891269
Change-Id: I191d5e54cd9c4a1e85aaa73fa08eeb9810342782
(cherry picked from commit 65625f39c8cc785f4bb3d8a22bf14e758ae23769)

gatekeeper_messages.cpp

diff --git a/gatekeeper_messages.cpp b/gatekeeper_messages.cpp
index b9ff8ea..4e5e833 100644
--- a/gatekeeper_messages.cpp
+++ b/gatekeeper_messages.cpp
@@ -95,7 +95,6 @@
 }
 
 gatekeeper_error_t GateKeeperMessage::Deserialize(const uint8_t *payload, const uint8_t *end) {
-    uint32_t error_value;
     if (payload + sizeof(uint32_t) > end) return ERROR_INVALID;
     const serial_header_t *header = reinterpret_cast<const serial_header_t *>(payload);
     if (header->error == ERROR_NONE) {

include/gatekeeper/gatekeeper_utils.h

diff --git a/include/gatekeeper/gatekeeper_utils.h b/include/gatekeeper/gatekeeper_utils.h
index 6439242..8ee032b 100644
--- a/include/gatekeeper/gatekeeper_utils.h
+++ b/include/gatekeeper/gatekeeper_utils.h
@@ -44,7 +44,7 @@
     return N;
 }
 
-static int memcmp_s(const void* p1, const void* p2, size_t length) {
+static inline int memcmp_s(const void* p1, const void* p2, size_t length) {
     const uint8_t* s1 = static_cast<const uint8_t*>(p1);
     const uint8_t* s2 = static_cast<const uint8_t*>(p2);
     uint8_t result = 0;