diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-05-01 20:51:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 20:51:36 +0000 |
| commit | 9bc1c49db5caa095c3935eecde645cd5b7227a8d (patch) | |
| tree | 5e3ae3494e826fa113b611b46c6a1f1bd731a317 | |
| parent | 2069d5d6bd3c7c11d363ca05da0e221f0170c9a8 (diff) | |
| parent | f1db961ffcd130b461f6bb7c183a5fb5e32dbb93 (diff) | |
| download | system_core-9bc1c49db5caa095c3935eecde645cd5b7227a8d.zip system_core-9bc1c49db5caa095c3935eecde645cd5b7227a8d.tar.gz system_core-9bc1c49db5caa095c3935eecde645cd5b7227a8d.tar.bz2 | |
am f1db961f: am 9c234a90: am 4f651d42: Merge "libsysutil: turn on -Werror (part deux)"
* commit 'f1db961ffcd130b461f6bb7c183a5fb5e32dbb93':
libsysutil: turn on -Werror (part deux)
| -rw-r--r-- | libsysutils/Android.mk | 2 | ||||
| -rw-r--r-- | libsysutils/src/NetlinkEvent.cpp | 7 |
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) { |