commit 038012129f90c3c5b4187d20924c6a3b4fdcc007
author Mark Salyzyn <salyzyn@google.com> Wed Apr 30 23:25:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 30 23:25:02 2014 +0000
tree b491418dd56fc8bd0d759efc2d0906943ca21af1
parent 1333e012ee65fef59f5f43f33744230574dfc2a2
parent a2723e0f7faee831ebc85e092768ee1417ae60f1

am a2723e0f: Merge "libsysutils: turn on -Werror"

* commit 'a2723e0f7faee831ebc85e092768ee1417ae60f1':
  libsysutils: turn on -Werror

libsysutils/Android.mk

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_C_INCLUDES :=
 
-LOCAL_CFLAGS :=
+LOCAL_CFLAGS := -Werror
 
 LOCAL_SHARED_LIBRARIES := libcutils liblog
 

libsysutils/src/FrameworkListener.cpp

diff --git a/libsysutils/src/FrameworkListener.cpp b/libsysutils/src/FrameworkListener.cpp
index 01ed54e..e7b3dd6 100644
--- a/libsysutils/src/FrameworkListener.cpp
+++ b/libsysutils/src/FrameworkListener.cpp
@@ -92,7 +92,6 @@
     char *qlimit = tmp + sizeof(tmp) - 1;
     bool esc = false;
     bool quote = false;
-    int k;
     bool haveCmdNum = !mWithSeq;
 
     memset(argv, 0, sizeof(argv));
@@ -166,7 +165,7 @@
         goto overflow;
     argv[argc++] = strdup(tmp);
 #if 0
-    for (k = 0; k < argc; k++) {
+    for (int k = 0; k < argc; k++) {
         SLOGD("arg[%d] = '%s'", k, argv[k]);
     }
 #endif

libsysutils/src/NetlinkEvent.cpp

diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp
index 34f2016..6976eba 100644
--- a/libsysutils/src/NetlinkEvent.cpp
+++ b/libsysutils/src/NetlinkEvent.cpp
@@ -399,7 +399,6 @@
     const char *s = buffer;
     const char *end;
     int param_idx = 0;
-    int i;
     int first = 1;
 
     if (size == 0)