summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-05-01 07:47:04 -0700
committerMark Salyzyn <salyzyn@google.com>2014-05-01 12:19:45 -0700
commit80f63d4b2c45bd609cbda78bcd016baf0138a5d3 (patch)
treef217b1f2477131b838e6ad84f5108990020f1f65
parentebf49f3e875981e9037ce36eddcab3ccb5925ebf (diff)
downloadsystem_core-80f63d4b2c45bd609cbda78bcd016baf0138a5d3.zip
system_core-80f63d4b2c45bd609cbda78bcd016baf0138a5d3.tar.gz
system_core-80f63d4b2c45bd609cbda78bcd016baf0138a5d3.tar.bz2
libsysutil: turn on -Werror (part deux)
- x86_64 format warnings Change-Id: I81c2702f564bcada946f6a10f34bbf34c90f766b
-rw-r--r--libsysutils/Android.mk2
-rw-r--r--libsysutils/src/NetlinkEvent.cpp7
2 files changed, 4 insertions, 5 deletions
diff --git a/libsysutils/Android.mk b/libsysutils/Android.mk
index 1451b0d..246f954 100644
--- a/libsysutils/Android.mk
+++ b/libsysutils/Android.mk
@@ -18,7 +18,7 @@ LOCAL_MODULE:= libsysutils
LOCAL_C_INCLUDES :=
-LOCAL_CFLAGS :=
+LOCAL_CFLAGS := -Werror
LOCAL_SHARED_LIBRARIES := libcutils liblog
diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp
index 6976eba..1c9c70a 100644
--- a/libsysutils/src/NetlinkEvent.cpp
+++ b/libsysutils/src/NetlinkEvent.cpp
@@ -109,7 +109,7 @@ bool NetlinkEvent::parseIfAddrMessage(int type, struct ifaddrmsg *ifaddr,
if (ifaddr->ifa_family == AF_INET) {
struct in_addr *addr4 = (struct in_addr *) RTA_DATA(rta);
if (RTA_PAYLOAD(rta) < sizeof(*addr4)) {
- SLOGE("Short IPv4 address (%d bytes) in %s",
+ SLOGE("Short IPv4 address (%zu bytes) in %s",
RTA_PAYLOAD(rta), msgtype);
continue;
}
@@ -117,7 +117,7 @@ bool NetlinkEvent::parseIfAddrMessage(int type, struct ifaddrmsg *ifaddr,
} else if (ifaddr->ifa_family == AF_INET6) {
struct in6_addr *addr6 = (struct in6_addr *) RTA_DATA(rta);
if (RTA_PAYLOAD(rta) < sizeof(*addr6)) {
- SLOGE("Short IPv6 address (%d bytes) in %s",
+ SLOGE("Short IPv6 address (%zu bytes) in %s",
RTA_PAYLOAD(rta), msgtype);
continue;
}
@@ -152,7 +152,7 @@ bool NetlinkEvent::parseIfAddrMessage(int type, struct ifaddrmsg *ifaddr,
}
if (RTA_PAYLOAD(rta) < sizeof(*cacheinfo)) {
- SLOGE("Short IFA_CACHEINFO (%d vs. %d bytes) in %s",
+ SLOGE("Short IFA_CACHEINFO (%zu vs. %zu bytes) in %s",
RTA_PAYLOAD(rta), sizeof(cacheinfo), msgtype);
continue;
}
@@ -174,7 +174,6 @@ bool NetlinkEvent::parseIfAddrMessage(int type, struct ifaddrmsg *ifaddr,
}
/*
-<<<<<<< HEAD
* Parse a RTM_NEWNDUSEROPT message.
*/
bool NetlinkEvent::parseNdUserOptMessage(struct nduseroptmsg *msg, int len) {